Automated merge with tip of viewer-release to pick up 4.0.5

1 files changed, 5 insertions, 21 deletions

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index b2be3cc3b6..b297223c2e 100755..100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -515,29 +515,13 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string&
 
 	if (log.length() > 0 || warns)
 	{
+        LL_DEBUGS("ShaderLoading") << "Shader loading ";
+        
 		if (!filename.empty())
 		{
-			if (warns)
-			{
-				LL_WARNS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
-			}
-			else
-			{
-				LL_INFOS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
-			}
-		}
-	}
-
-	if ( log.length() > 0 )
-	{
-		if (warns)
-		{
-			LL_WARNS("ShaderLoading") << log << LL_ENDL;
-		}
-		else
-		{
-			LL_INFOS("ShaderLoading") << log << LL_ENDL;
-		}
+            LL_CONT << "From " << filename << ":\n";
+        }
+        LL_CONT << log << LL_ENDL;
 	}
  }