2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e69de29..2cc6cca 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -0,0 +1,5 @@
+2008-09-17  Nicholaz Beresford  <nicholaz@blueflash.cc>
+
+        * linden/indra/newview/llviewerjointattachment.h (LLViewerJoint): 
+        VWR-2685: Possible crash in bounding box (getBoundingBoxAgent())
+        from hud attachments.
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index 8e665aa..a69c10c 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -98,8 +98,7 @@ protected:
         void calcLOD();
         
 protected:
-        // Backlink only; don't make this an LLPointer.
-        LLViewerObject* mAttachedObject;
+        LLPointer<LLViewerObject> mAttachedObject;
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;
         S32                             mGroup;