summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-05-05 21:10:51 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-05-05 21:10:51 +0300
commit140c576c37e365bd1a616ae6eca1b7ce9f77ffab (patch)
tree81e069b31fb25893cc3d8012116a66380455075d /indra/newview/app_settings
parentf73f2c410e12abc2ccf3e0ae2719111cb285962a (diff)
parente2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff)
Merge from default branch (first sync with dessie/viewer-public).
--HG-- branch : product-engine
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 d689822e4e..db5da4c9e5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1652,6 +1652,17 @@
<key>Value</key>
<string />
</map>
+ <key>DebugAvatarRezTime</key>
+ <map>
+ <key>Comment</key>
+ <string>Display times for avatars to resolve.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>DebugBeaconLineWidth</key>
<map>
<key>Comment</key>