Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat

4 files changed, 19 insertions, 20 deletions

diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp
index debdf416cd..4a5cff1dc3 100644
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -89,8 +89,7 @@ BOOL LLSkinJoint::setupSkinJoint( LLAvatarJoint *joint)
 	mJoint = joint;
 	if ( !mJoint )
 	{
-		//llinfos << "Can't find joint" << llendl;
-		return FALSE;
+		llinfos << "Can't find joint" << llendl;
 	}
 
 	// compute the inverse root skin matrix
diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index e176d0844b..a01457246e 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -889,10 +889,10 @@ void LLPolyMesh::dumpDiagInfo()
 
         std::string buf;
 
-        //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
-        //LL_DEBUGS("LLPolyMesh") << "       Global PolyMesh Table (DEBUG only)" << llendl;
-        //LL_DEBUGS("LLPolyMesh") << "   Verts    Faces  Mem(KB) Name" << llendl;
-        //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+        llinfos << "-----------------------------------------------------" << llendl;
+        llinfos << "       Global PolyMesh Table (DEBUG only)" << llendl;
+        llinfos << "   Verts    Faces  Mem(KB) Name" << llendl;
+        llinfos << "-----------------------------------------------------" << llendl;
 
         // print each loaded mesh, and it's memory usage
         for(LLPolyMeshSharedDataTable::iterator iter = sGlobalSharedMeshList.begin();
@@ -906,17 +906,17 @@ void LLPolyMesh::dumpDiagInfo()
                 U32 num_kb = mesh->getNumKB();
 
                 buf = llformat("%8d %8d %8d %s", num_verts, num_faces, num_kb, mesh_name.c_str());
-                //LL_DEBUGS("LLPolyMesh") << buf << llendl;
+                llinfos << buf << llendl;
 
                 total_verts += num_verts;
                 total_faces += num_faces;
                 total_kb += num_kb;
         }
 
-        //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+        llinfos << "-----------------------------------------------------" << llendl;
         buf = llformat("%8d %8d %8d TOTAL", total_verts, total_faces, total_kb );
-        //LL_DEBUGS("LLPolyMesh") << buf << llendl;
-        //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+        llinfos << buf << llendl;
+        llinfos << "-----------------------------------------------------" << llendl;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 228cdcd5ba..f951a982e5 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1203,7 +1203,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height)
 			}
 			else
 			{
-				//LL_DEBUGS("LLTexLayer") << "lto not defined or image not defined: " << getInfo()->getLocalTexture() << " lto: " << mLocalTextureObject << llendl;
+				llinfos << "lto not defined or image not defined: " << getInfo()->getLocalTexture() << " lto: " << mLocalTextureObject << llendl;
 			}
 //			if( mTexLayerSet->getAvatarAppearance()->getLocalTextureGL((ETextureIndex)getInfo()->mLocalTexture, &image_gl ) )
 			{
@@ -1291,7 +1291,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height)
 
 	if( !success )
 	{
-		//LL_DEBUGS("LLTexLayer") << "LLTexLayer::render() partial: " << getInfo()->mName << llendl;
+		llinfos << "LLTexLayer::render() partial: " << getInfo()->mName << llendl;
 	}
 	return success;
 }
@@ -1891,18 +1891,18 @@ LLTexLayerStaticImageList::~LLTexLayerStaticImageList()
 
 void LLTexLayerStaticImageList::dumpByteCount() const
 {
-	//LL_DEBUGS("LLTexLayerStaticImageList")  << "Avatar Static Textures " <<
-	//	"KB GL:" << (mGLBytes / 1024) <<
-	//	"KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
+	llinfos << "Avatar Static Textures " <<
+		"KB GL:" << (mGLBytes / 1024) <<
+		"KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
 }
 
 void LLTexLayerStaticImageList::deleteCachedImages()
 {
 	if( mGLBytes || mTGABytes )
 	{
-		//LL_DEBUGS("LLTexLayerStaticImageList") << "Clearing Static Textures " <<
-		//	"KB GL:" << (mGLBytes / 1024) <<
-		//	"KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
+		llinfos << "Clearing Static Textures " <<
+			"KB GL:" << (mGLBytes / 1024) <<
+			"KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
 
 		//mStaticImageLists uses LLPointers, clear() will cause deletion
 		
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 49e0546544..6aae9a8cc1 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -86,7 +86,7 @@ void LLTexLayerParamAlpha::dumpCacheByteCount()
 {
 	S32 gl_bytes = 0;
 	getCacheByteCount( &gl_bytes);
-	LL_DEBUGS("LLTexLayerParamAlpha") << "Processed Alpha Texture Cache GL:" << (gl_bytes/1024) << "KB" << llendl;
+	llinfos << "Processed Alpha Texture Cache GL:" << (gl_bytes/1024) << "KB" << llendl;
 }
 
 // static 
@@ -481,7 +481,7 @@ void LLTexLayerParamColor::setWeight(F32 weight, BOOL upload_bake)
 			}
 		}
 
-//		LL_DEBUGS(LLTexLayerParamAlpha) << "param " << mName << " = " << new_weight << llendl;
+//		llinfos << "param " << mName << " = " << new_weight << llendl;
 	}
 }