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

@@ -36,7 +36,12 @@ class LLVOInventoryListener
 	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