summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/logcontrol.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-03 14:13:12 -0400
committerOz Linden <oz@lindenlab.com>2011-08-03 14:13:12 -0400
commit299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch)
tree985a3fe37b693cf377c953a880c967f5e29b2abc /indra/newview/app_settings/logcontrol.xml
parent01ee25cca43b175567859becd1eacf77db24af55 (diff)
parent93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff)
Automated merge with file:///Users/oz/Work/V-PR
Diffstat (limited to 'indra/newview/app_settings/logcontrol.xml')
-rw-r--r--indra/newview/app_settings/logcontrol.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 9f4e89691f..ae72dee900 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -44,7 +44,6 @@
<array>
<!-- sample entry for debugging a specific item -->
<!-- <string>Voice</string> -->
- <string>Capabilities</string>
</array>
</map>
</array>