diff options
author | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
commit | 093e83386d5a132cc8947095f93ea6405aab6e3f (patch) | |
tree | 043184fa92c8a6a9f8e747eb13056616bb27ba20 /indra/newview/app_settings | |
parent | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (diff) | |
parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e6d6032fef..09b0e03b34 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> @@ -8340,17 +8351,6 @@ <key>Value</key> <real>1.0</real> </map> - <key>RunMultipleThreads</key> - <map> - <key>Comment</key> - <string>If TRUE keep background threads active during render</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>SafeMode</key> <map> <key>Comment</key> |