1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index a8c2c71..ce2f8b9 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -79,7 +79,7 @@ public:
 
         S32 getGroup() { return mGroup; }
         S32 getPieSlice() { return mPieSlice; }
-        BOOL getAttachmentDirty() { return mAttachmentDirty && mAttachedObject.notNull(); }
+        BOOL getAttachmentDirty() { return mAttachmentDirty && mAttachedObject; }
         LLViewerObject *getObject() { return mAttachedObject; }
         S32     getNumObjects() { return (mAttachedObject ? 1 : 0); }
         const LLUUID& getItemID() { return mItemID; }
@@ -99,7 +99,8 @@ protected:
         
 protected:
         LLJoint*                mJoint;
-        LLPointer<LLViewerObject>       mAttachedObject;
+        // Backlink only; don't make this an LLPointer.
+        LLViewerObject* mAttachedObject;
         BOOL                    mAttachmentDirty;       // does attachment drawable need to be fixed up?
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;