diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
| commit | 4e62d8cc9cf7ea391ab08c6fa6eecb375eb249b0 (patch) | |
| tree | 205da4dc5c4c4b10fe6d7f6c80d77641e06df193 /indra/newview/app_settings/settings.xml | |
| parent | ac9f9d82a08840aac569f853e0d4b24d0e4ad103 (diff) | |
| parent | 116382fdf78ca578a74c30a162208033fd021124 (diff) | |
Merge from default branch. Fixed gcc build.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -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 810b2d9a1d..51ed26505e 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> @@ -8284,17 +8295,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> |