Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid spam when debugging plugins

2 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index c94fc51..cdc837d 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -66,7 +66,15 @@
 
                                                         <!--<string>Messaging</string>-->
                                                         <!--<string>Notifications</string>-->
-              <!--<string>Plugin</string>-->
+                <string>Plugin</string>
+                <string>PluginClassMedia</string>
+                <string>PluginInstance</string>
+                <string>PluginPipe</string>
+                <string>PluginChild</string>
+                <!--<string>PluginSpam</string>-->
+                <string>PluginParent</string>
+                <string>PluginViewerMedia</string>
+
               <!--<string>Radar</string>-->
                                                         <!--<string>ShaderLoading</string>-->
 
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 5c01b25..f0faedf 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -402,7 +402,7 @@ bool LLViewerMediaImpl::initializeMedia(const std::string& mime_type)
         {
                 if(! initializePlugin(mime_type))
                 {
-                        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL;
+                        LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL;
                         LLSD args;
                         args["MIME_TYPE"] = mime_type;
                         LLNotifications::instance().add("NoPlugin", args);
@@ -520,7 +520,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 }
         }
 
-        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
+        LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << media_type << LL_ENDL;
         LLSD args;
         args["MIME_TYPE"] = media_type;
         LLNotifications::instance().add("NoPlugin", args);