summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-03 15:41:53 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-03 15:41:53 -0500
commitfaa08ed4a17934dc7bd901c4b3ab9cef2dda103e (patch)
treeddcf1750664201b9c37d3c523170ecd8e5110aa4 /indra/llcharacter
parent2f4a3197bfdb5200d4472343b729fe7ff7eb9225 (diff)
parent4e922949a9a1e508a698ce5a03657f1417252d9f (diff)
merge
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/lljoint.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 4c8bd690e8..cbfca588b0 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -83,6 +83,7 @@ protected:
LLXformMatrix mOldXform;
LLXformMatrix mDefaultXform;
+ LLUUID mId;
public:
U32 mDirtyFlags;
BOOL mUpdateXform;
@@ -182,6 +183,8 @@ public:
void setDefaultFromCurrentXform( void );
void storeCurrentXform( const LLVector3& pos );
+ LLUUID getId( void ) { return mId; }
+ void setId( const LLUUID& id ) { mId = id;}
};
#endif // LL_LLJOINT_H