1 files changed, 15 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 3d4bbe5..437a768 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -2577,8 +2577,21 @@ bool LLParcelSelection::hasOthersSelected() const
         return mSelectedOtherCount != 0;
 }
 
+static LLPointer<LLParcelSelection> sNullSelection;
+
 LLParcelSelection* get_null_parcel_selection()
 {
-        static LLParcelSelection null_selection;
-        return &null_selection;
+        if (sNullSelection.isNull())
+        {
+                sNullSelection = new LLParcelSelection;
+        }
+        
+        return sNullSelection;
+}
+
+void LLViewerParcelMgr::cleanupGlobals()
+{
+        delete gParcelMgr;
+        gParcelMgr = NULL;
+        sNullSelection = NULL;
 }