summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-08-18 12:05:41 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-08-18 12:05:41 -0600
commit104aec161e6675ed54b80f64766dea0555f7d175 (patch)
tree87592cabacbeb70ada8d74a81229c96163a68dc0 /indra/newview/app_settings
parent1d70c6a42249b5e53403ac7d0126a392cf1a293e (diff)
parent3ac134ec228d81a222d4df58be9577faa6757539 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
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 810b2d9a1d..2130713d50 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1741,6 +1741,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>DebugAvatarLocalTexLoadedTime</key>
+ <map>
+ <key>Comment</key>
+ <string>Display time for loading avatar local textures.</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>