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/llvoavatar.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'indra/newview/llvoavatar.h')
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 49b9fe1536..22fc595ea2 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -611,8 +611,9 @@ public:
// Appearance morphing
//--------------------------------------------------------------------
public:
- BOOL mAppearanceAnimating;
+ BOOL getIsAppearanceAnimating() const { return mAppearanceAnimating; }
private:
+ BOOL mAppearanceAnimating;
LLFrameTimer mAppearanceMorphTimer;
F32 mLastAppearanceBlendTime;
@@ -622,7 +623,7 @@ private:
public:
void setClothesColor(LLVOAvatarDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake);
LLColor4 getClothesColor(LLVOAvatarDefines::ETextureIndex te);
- static BOOL teToColorParams(LLVOAvatarDefines::ETextureIndex te, U32 *param_name);
+ static BOOL teToColorParams(LLVOAvatarDefines::ETextureIndex te, U32 *param_name);
//--------------------------------------------------------------------
// Global colors
--
cgit v1.2.3
From a49f4090b8d9d2519439b4d7ba4904b165d569cc Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 20 Jul 2010 16:36:39 -0600
Subject: EXT-7500: FIXED: Texture Jamming problems with http texture off
---
indra/newview/llvoavatar.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra/newview/llvoavatar.h')
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 22fc595ea2..8ffcfc7ed4 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -1049,6 +1049,7 @@ protected: // Shared with LLVOAvatarSelf
*******************************************************************************/
}; // LLVOAvatar
-extern const F32 SELF_ADDITIONAL_PRI;
+extern const F32 SELF_ADDITIONAL_PRI;
+extern const S32 MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL;
#endif // LL_VO_AVATAR_H
--
cgit v1.2.3