summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
commit33a0e1d07bb90117b60d5f79f0cdd3529ec595da (patch)
tree6cea69c52dccf3ed3f5e0e77f80aa77f8ad88e9f /indra/newview/app_settings
parent6387426c990ad32623d57ad7fa190d78b2d5dbb6 (diff)
parent3df90898b18feeda876857acb00f1f3046793e69 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9974b57ab2..c2f110e8fc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -574,14 +574,14 @@
<key>Value</key>
<integer>2</integer>
</map>
- <key>AvatarUseBakedTextureTimeout</key>
+ <key>AvatarBakedTextureTimeout</key>
<map>
<key>Comment</key>
- <string>Specifes whether to send your baked textures for avatar appearance even before textures are fully ressed in case of timeout</string>
+ <string>Specifes the maximum time in seconds to wait before sending your baked textures for avatar appearance. Set to 0 to disable and wait until all baked textures are at highest resolution.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>