Suppress some overly verbose logging

5 files changed, 25 insertions, 17 deletions

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index de3732f339..ecd7c4bc36 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -5,7 +5,23 @@
 		<key>print-location</key>   <boolean>false</boolean>
 		<key>settings</key>
 			<array>
-				<!-- sample entry for changing settings on specific items -->
+				<!-- Suppress anything but ERROR for some very verbose components -->
+				<map>
+					<key>level</key><string>ERROR</string>
+					<key>functions</key>
+						<array>
+						</array>
+					<key>classes</key>
+						<array>
+						</array>
+					<key>files</key>
+						<array>
+						</array>
+					<key>tags</key>
+						<array>
+							<string>ShaderLoading</string>
+						</array>
+				</map>
 				<map>
 					<key>level</key><string>INFO</string>
 					<key>functions</key>
@@ -19,14 +35,6 @@
 						</array>
 					<key>tags</key>
 						<array>
-							<string>AppInit</string>
-							<string>Capabilities</string>
-							<string>SystemInfo</string>
-							<string>TextureCache</string>
-							<string>AppCache</string>
-							<string>Window</string>
-							<string>RenderInit</string>
-							<string>MediaAuth</string>
 						</array>
 				</map>
 				<map>
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index d351b38653..2760a97bda 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -311,7 +311,7 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
 				}
 				else
 				{
-					LL_INFOS("AvatarRenderInfo") << "Sent render costs for " << num_avs
+					LL_DEBUGS("AvatarRenderInfo") << "Sent render costs for " << num_avs
 												 << " avatars to region " << regionp->getName()
 												 << LL_ENDL;
 
@@ -356,7 +356,7 @@ void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regi
 																 handler);
 			if (LLCORE_HTTP_HANDLE_INVALID != handle)
 			{
-				LL_INFOS("AvatarRenderInfo") << "Requested avatar render info for region "
+				LL_DEBUGS("AvatarRenderInfo") << "Requested avatar render info for region "
 											 << regionp->getName() 
 											 << LL_ENDL;
 			}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6ba10373b9..6ab7a324cb 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2468,7 +2468,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			buffer = message;
 	
-			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
 			// add to IM panel, but do not bother the user
 			gIMMgr->addMessage(
@@ -2517,7 +2517,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 			buffer = saved + message;
 
-			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			LL_DEBUGS("Messaging") << "session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
 			bool mute_im = is_muted;
 			if(accept_im_from_only_friend && !is_friend && !is_linden)
@@ -2982,7 +2982,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			buffer = message;
 	
-			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			LL_DEBUGS("Messaging") << "message in dnd; session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
 			// add to IM panel, but do not bother the user
 			gIMMgr->addMessage(
@@ -3009,7 +3009,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			buffer = saved + message;
 
-			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			LL_DEBUGS("Messaging") << "standard message session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
 			gIMMgr->addMessage(
 				session_id,
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 374792193c..28ae569ba2 100755
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -89,7 +89,7 @@ void LLWaterParamManager::loadAllPresets()
 
 void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
 {
-	LL_INFOS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
+	LL_DEBUGS("AppInit", "Shaders") << "Loading water presets from " << dir << LL_ENDL;
 
 	LLDirIterator dir_iter(dir, "*.xml");
 	while (1)
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
index 88079c5d26..106f17f61b 100755
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -107,7 +107,7 @@ void LLWLDayCycle::loadDayCycleFromFile(const std::string & fileName)
 // static
 LLSD LLWLDayCycle::loadDayCycleFromPath(const std::string& file_path)
 {
-	LL_INFOS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL;
+	LL_DEBUGS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL;
 	
 	llifstream day_cycle_xml(file_path.c_str());
 	if (day_cycle_xml.is_open())