summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-08-27 16:25:02 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-08-27 16:25:02 -0400
commitd020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch)
tree67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/newview/app_settings
parent745845f79987e4b4ab7f5728746a0eda8898930f (diff)
parent70600ea66adc816e72e91e804deebde40ed6b1bc (diff)
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/newview/app_settings')
-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 4e64b8662c..2fe8fd5b00 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5337,6 +5337,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>QAModeEventHostPort</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable Testing Features.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>-1</integer>
+ </map>
<key>QuietSnapshotsToDisk</key>
<map>
<key>Comment</key>