From 87f424c64ff159a9e071544ae3f290b29eb28d7e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 26 Jun 2007 18:27:02 +0000 Subject: Merge fix for SL-46373 / VWR-1369 / Intermittent Crash on Edit from Pie Menu NOTE: Only a partial merge from maintenance!!!! svn merge -r 64309:64310 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release --- indra/newview/llvoinventorylistener.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoinventorylistener.h b/indra/newview/llvoinventorylistener.h index 7f14b5d74a..80874431ea 100644 --- a/indra/newview/llvoinventorylistener.h +++ b/indra/newview/llvoinventorylistener.h @@ -36,7 +36,12 @@ protected: void requestVOInventory(); private: - LLPointer mListenerVObject; + // LLViewerObject is normally wrapped by an LLPointer, but not in + // this case, because it's already sure to be kept alive by + // LLPointers held by other objects that have longer lifetimes + // than this one. Plumbing correct LLPointer usage all the way + // down here has been deemed too much work for now. + LLViewerObject *mListenerVObject; }; #endif -- cgit v1.2.3