From db940c7d4dccadef10ff909db3cdc47bbf7be534 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 27 May 2007 07:20:41 +0000
Subject: [PATCH] whoops

---
 stepmania/src/ActorUtil.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 847dde2e4e..00d59d354e 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -175,12 +175,7 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
 static void MergeActorXML( XNode *pChild, const XNode *pParent )
 {
 	FOREACH_CONST_Child( pParent, p )
-	{
-		LOG->Trace( "append 1: \"%s\"",
-			XmlFileUtil::GetXML(p).c_str() );
-
 		pChild->AppendChild( new XNode(*p) );
-	}
 
 	FOREACH_CONST_Attr( pParent, p )
 	{
@@ -188,7 +183,7 @@ static void MergeActorXML( XNode *pChild, const XNode *pParent )
 		if( !EndsWith(sName, "Command") )
 			continue;
 
-//		if( pChild->GetAttr(p->first) != NULL )
+		if( pChild->GetAttr(p->first) != NULL )
 		{
 			RString sWarning = 
 				ssprintf( "%s: overriding \"%s\" in %s node \"%s\"",