diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-20 12:16:46 -0700 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-20 12:16:46 -0700 |
| commit | bb8919c013b1c219d79e2a71b89c4a842058f7bf (patch) | |
| tree | f9a96c1072d101d598240952eabe2d6b62d4cc97 /indra/newview/app_settings | |
| parent | 45b60984777e26b2cfe3c289fe60b5155eafb847 (diff) | |
| parent | 116382fdf78ca578a74c30a162208033fd021124 (diff) | |
merge from viewer-release
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 4c52fb015f..07418d1b5e 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> @@ -8318,17 +8329,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> |