Merge branch 'VWR-2685' into nicholaz-patches

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d29f445..5564136 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+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.
+
 2008-09-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/lltexturecache.cpp (purgeTextureFilesTimeSliced):
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;