Broken: relog sometimes works once; fixed inventory and avatar not ruthed anymore.

	deleted:    Imprudence.log
	modified:   linden/indra/newview/llagent.cpp
	modified:   linden/indra/newview/llappviewer.cpp
	modified:   linden/indra/newview/llinventorymodel.cpp
	modified:   linden/indra/newview/llinventorymodel.h
	modified:   linden/indra/newview/llinventoryview.cpp
	modified:   linden/indra/newview/llviewerjointattachment.h
	modified:   linden/indra/newview/llviewermenu.cpp
	deleted:    mAttachedObject.diff.txt
	deleted:    meerkat-llmenugl.diff.txt
	deleted:    meerkat-message.diff.txt
	deleted:    meerkat-pipeline.cpp.diff.txt
	deleted:    meerkat-voice.diff.txt
	deleted:    stack_trace.log

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index dd63bfd..cbfee0b 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -98,7 +98,9 @@ protected:
         void calcLOD();
         
 protected:
-        LLPointer<LLViewerObject> mAttachedObject;
+
+        // Backlink only; don't make this an LLPointer.
+        LLViewerObject* mAttachedObject;
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;
         S32                             mGroup;