From cfd35b8b22e8043ab14c57f6ee6108cea471a1ab Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 28 Mar 2013 18:07:54 -0400
Subject: Made a bug that was masking the warning about mismatched caps coming
 from a region. They could never match because certain capabilities are
 explicitly not stored when we receive them. * Made mSecondCapabilitiesTracker
 set capabilities in a way that more closely matches mCapabilities so that
 they will match up when we get a second cap grant from a region if the caps
 that were sent are actually the same. * Added more logging around setting a
 region's seed capability. * Also added a static function in llviewerregion to
 dump out a CapabilityMap based on the logActiveCapabilities method. Defined
 the old method in terms of the new static free function.

---
 indra/newview/app_settings/logcontrol.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/logcontrol.xml')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index c5561166fc..04b3c81602 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -43,9 +43,7 @@
 					<key>tags</key>
 						<array>
 						     <string>Avatar</string>
-						<!-- sample entry for debugging specific items	
-						     <string>Voice</string>		
-						-->
+						     <string>CrossingCaps</string>		
 						</array>
 				</map>
       </array>
-- 
cgit v1.2.3


From 298660a5f15e08ef00c240330553f3228db5437f Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Mon, 1 Apr 2013 11:59:27 -0400
Subject: Backed out accidentally committed change to logcontrol.xml.

---
 indra/newview/app_settings/logcontrol.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/logcontrol.xml')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 04b3c81602..c5561166fc 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -43,7 +43,9 @@
 					<key>tags</key>
 						<array>
 						     <string>Avatar</string>
-						     <string>CrossingCaps</string>		
+						<!-- sample entry for debugging specific items	
+						     <string>Voice</string>		
+						-->
 						</array>
 				</map>
       </array>
-- 
cgit v1.2.3


From 0f6a4a3389cdce6d5bb92cd6f4861a46def284cc Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 20 May 2013 18:06:26 -0400
Subject: SH-4200 FIX - retry ais ops on 5xx errors, dialed back some verbose
 logging.

---
 indra/newview/app_settings/logcontrol.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/app_settings/logcontrol.xml')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 92a241857e..6594fdb249 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -43,6 +43,7 @@
 					<key>tags</key>
 						<array>
 						<!-- sample entry for debugging specific items	
+						     <string>Inventory</string>
 						     <string>Avatar</string>
 						     <string>Voice</string>		
 						-->
-- 
cgit v1.2.3