aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r--linden/indra/newview/llvoavatar.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 0bf648a..1914f47 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -39,6 +39,7 @@
39#include <string> 39#include <string>
40#include <vector> 40#include <vector>
41 41
42#include "imageids.h" // IMG_INVISIBLE
42#include "llchat.h" 43#include "llchat.h"
43#include "lldrawpoolalpha.h" 44#include "lldrawpoolalpha.h"
44#include "llviewerobject.h" 45#include "llviewerobject.h"
@@ -342,7 +343,7 @@ public:
342 BOOL teToColorParams( LLVOAvatarDefines::ETextureIndex te, const char* param_name[3] ); 343 BOOL teToColorParams( LLVOAvatarDefines::ETextureIndex te, const char* param_name[3] );
343 344
344 BOOL isWearingWearableType( EWearableType type ); 345 BOOL isWearingWearableType( EWearableType type );
345 void wearableUpdated( EWearableType type ); 346 void wearableUpdated(EWearableType type, BOOL upload_result = TRUE);
346 347
347 //-------------------------------------------------------------------- 348 //--------------------------------------------------------------------
348 // texture compositing 349 // texture compositing
@@ -602,6 +603,7 @@ private:
602 BOOL mIsBuilt; // state of deferred character building 603 BOOL mIsBuilt; // state of deferred character building
603 F32 mSpeedAccum; // measures speed (for diagnostics mostly). 604 F32 mSpeedAccum; // measures speed (for diagnostics mostly).
604 605
606 BOOL mSupportsAlphaLayers; // For backwards compatibility, TRUE for 1.23+ clients
605 607
606 // LLFrameTimer mUpdateLODTimer; // controls frequency of LOD change calculations 608 // LLFrameTimer mUpdateLODTimer; // controls frequency of LOD change calculations
607 BOOL mDirtyMesh; 609 BOOL mDirtyMesh;
@@ -827,7 +829,7 @@ inline BOOL LLVOAvatar::isTextureDefined(U8 te) const
827 829
828inline BOOL LLVOAvatar::isTextureVisible(U8 te) const 830inline BOOL LLVOAvatar::isTextureVisible(U8 te) const
829{ 831{
830 return ((isTextureDefined(te) || isSelf()) 832 return ((isTextureDefined(te) || mIsSelf)
831 && (getTEImage(te)->getID() != IMG_INVISIBLE 833 && (getTEImage(te)->getID() != IMG_INVISIBLE
832 || LLDrawPoolAlpha::sShowDebugAlpha)); 834 || LLDrawPoolAlpha::sShowDebugAlpha));
833} 835}