From 020b156299a2aa0ab7d035850daaeec57a8e9045 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 15 Jul 2010 17:24:12 -0400
Subject: EXT-8135 FIXED Textures blurry when in Appearance Edit mode EXT-8445
 Reduce baked texture timeout fro 120sec to 60sec default

Also did some minor infrastructure cleanup, added code comments, etc.  There is now separate logic for determining how to handle update (versus upload) requests.
Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating.
Also reduced the baked texture timeout to 60s (in settings.xml)
---
 indra/newview/app_settings/settings.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index af296f918e..810b2d9a1d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -585,7 +585,7 @@
       <key>Value</key>
       <integer>2</integer>
     </map>
-    <key>AvatarBakedTextureTimeout</key>
+    <key>AvatarBakedTextureUploadTimeout</key>
     <map>
       <key>Comment</key>
       <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>
@@ -594,8 +594,20 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>120</integer>
+      <integer>60</integer>
     </map>
+    <key>AvatarBakedLocalTextureUpdateTimeout</key>
+    <map>
+      <key>Comment</key>
+      <string>Specifes the maximum time in seconds to wait before updating your appearance during appearance mode.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>10</integer>
+    </map>
+
     <key>AvatarSex</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3