livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2007-06-26 18:27:02 +00:00
parent afaeeb499c
commit 87f424c64f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvoinventorylistener.h
View File

@ -36,7 +36,12 @@ protected:
void requestVOInventory();
private:
LLPointer<LLViewerObject> 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