aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjointattachment.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:59 -0500
committerJacek Antonelli2008-08-15 23:44:59 -0500
commita408bac29378072fbf36864164149458c978cfcc (patch)
tree67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/llviewerjointattachment.h
parentSecond Life viewer sources 1.17.0.12 (diff)
downloadmeta-impy-a408bac29378072fbf36864164149458c978cfcc.zip
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/newview/llviewerjointattachment.h')
-rw-r--r--linden/indra/newview/llviewerjointattachment.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index 0c8469c..a8c2c71 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -79,7 +79,7 @@ public:
79 79
80 S32 getGroup() { return mGroup; } 80 S32 getGroup() { return mGroup; }
81 S32 getPieSlice() { return mPieSlice; } 81 S32 getPieSlice() { return mPieSlice; }
82 BOOL getAttachmentDirty() { return mAttachmentDirty && mAttachedObject; } 82 BOOL getAttachmentDirty() { return mAttachmentDirty && mAttachedObject.notNull(); }
83 LLViewerObject *getObject() { return mAttachedObject; } 83 LLViewerObject *getObject() { return mAttachedObject; }
84 S32 getNumObjects() { return (mAttachedObject ? 1 : 0); } 84 S32 getNumObjects() { return (mAttachedObject ? 1 : 0); }
85 const LLUUID& getItemID() { return mItemID; } 85 const LLUUID& getItemID() { return mItemID; }
@@ -99,7 +99,7 @@ protected:
99 99
100protected: 100protected:
101 LLJoint* mJoint; 101 LLJoint* mJoint;
102 LLViewerObject* mAttachedObject; 102 LLPointer<LLViewerObject> mAttachedObject;
103 BOOL mAttachmentDirty; // does attachment drawable need to be fixed up? 103 BOOL mAttachmentDirty; // does attachment drawable need to be fixed up?
104 BOOL mVisibleInFirst; 104 BOOL mVisibleInFirst;
105 LLVector3 mOriginalPos; 105 LLVector3 mOriginalPos;