summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-16 18:19:43 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-16 18:19:43 -0800
commitd3b03c7f53388a4a43cbce7c5ab196ab469d4abd (patch)
tree1199b9a925e21a2a8d82dcb2cf4ee91927d82f0b /indra/newview/app_settings/settings.xml
parent6e7d131e5800d921ec9bcf7b51f619256367fa55 (diff)
parent27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff)
Merge with viewer-2-0 changes
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f2193c4139..94a2ca16f4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4545,6 +4545,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>MediaPerformanceManagerDebug</key>
+ <map>
+ <key>Comment</key>
+ <string>Whether to show debug data for the media performance manager in the nearby media list.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>MemoryLogFrequency</key>
<map>
<key>Comment</key>