summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2013-03-28 18:07:54 -0400
committerLogan Dethrow <log@lindenlab.com>2013-03-28 18:07:54 -0400
commitcfd35b8b22e8043ab14c57f6ee6108cea471a1ab (patch)
tree16215ef4d5cbd202813f7282f257c593ba5241cc /indra/newview/app_settings
parent30ba176d185f238ffd4d563730e8fef4078b904c (diff)
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.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/logcontrol.xml4
1 files changed, 1 insertions, 3 deletions
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>