summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-01 11:08:44 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-01 11:08:44 -0700
commit52708727f4bd1bf98d0ee727a15689e7c65d965d (patch)
treedaf0e802de6abf26c098a3510d9cef40bb866218 /indra/newview/app_settings
parenta6ff5974c36f8ea860b2065c549333d8cfc6a458 (diff)
parent3e5819d86226d6b3d5fbd24db701c6f57f607b39 (diff)
Merge with SVN viewer-2.0.0-3 branch
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 4e2f836606..2a08f62bb4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23,6 +23,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>AgentPause</key>
+ <map>
+ <key>Comment</key>
+ <string>Ask the simulator to stop updating the agent while enabled</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>