summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearance.h
diff options
context:
space:
mode:
authorAnchor <none@none>2018-11-28 15:16:01 -0800
committerAnchor <none@none>2018-11-28 15:16:01 -0800
commit014480a79b765587881d0c0f707a7ee191f5fe2e (patch)
tree4d759c7b996065cccb9171a51a1a3f05d04b6e31 /indra/llappearance/llavatarappearance.h
parent076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (diff)
parent8558ce5c600b810356010ba3cd6d534ef22f4081 (diff)
Merge
Diffstat (limited to 'indra/llappearance/llavatarappearance.h')
-rw-r--r--indra/llappearance/llavatarappearance.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index ccd6323ed8..7815c1844b 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -70,6 +70,7 @@ public:
static void initClass();
static void cleanupClass(); // Cleanup data that's only init'd once per class.
virtual void initInstance(); // Called after construction to initialize the instance.
+ S32 mInitFlags;
virtual BOOL loadSkeletonNode();
BOOL loadMeshNodes();
BOOL loadLayersets();
@@ -227,7 +228,7 @@ protected:
** RENDERING
**/
public:
- BOOL mIsDummy; // for special views
+ BOOL mIsDummy; // for special views and animated object controllers; local to viewer
//--------------------------------------------------------------------
// Morph masks