summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-05-30 17:44:51 -0400
committerNyx Linden <nyx@lindenlab.com>2013-05-30 17:44:51 -0400
commit7f2cf1fa9cf7c09af8eeab3aa077eb0a9922d631 (patch)
tree41343ac34f14dfedbf38a7011502fc653fda6532 /indra/newview/llviewerobject.h
parentfaaf8ba5c75c925d9922dda8ce43293222cadb3b (diff)
SH-4147 FIX Macro avatar hover gets reset on relog
Hover minimum enforcement was getting triggered on relog for macro avatars before the joint offsets were applied when loading the avatar. Added code to verify that all attachments in COF have been rezzed, and all attached objects are not in the process of being rebuilt to the enforcement code. This should verify that we only apply the hover value enforcement when all rigged meshes are actually loaded before enforcing minimum hover value
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rwxr-xr-xindra/newview/llviewerobject.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 316dbce7d0..0390cbc5b0 100755
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -394,6 +394,7 @@ public:
void setDrawableState(U32 state, BOOL recursive = TRUE);
void clearDrawableState(U32 state, BOOL recursive = TRUE);
+ BOOL isDrawableState(U32 state, BOOL recursive = TRUE) const;
// Called when the drawable shifts
virtual void onShift(const LLVector4a &shift_vector) { }