1 files changed, 16 insertions, 4 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index ec7ba78..5086432 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -121,7 +121,7 @@ LLColor4 LLSelectMgr::sHighlightParentColor;
 LLColor4 LLSelectMgr::sHighlightChildColor;
 LLColor4 LLSelectMgr::sContextSilhouetteColor;
 
-static LLObjectSelection* get_null_object_selection();
+static LLObjectSelection *get_null_object_selection();
 template<> 
         const LLHandle<LLObjectSelection>::NullFunc 
                 LLHandle<LLObjectSelection>::sNullFunc = get_null_object_selection;
@@ -145,14 +145,26 @@ struct LLDeRezInfo
 //
 
 
+static LLPointer<LLObjectSelection> sNullSelection;
+
 //
 // Functions
 //
 
-LLObjectSelection* get_null_object_selection()
+void LLSelectMgr::cleanupGlobals()
+{
+        delete gSelectMgr;
+        gSelectMgr = NULL;
+        sNullSelection = NULL;
+}
+
+LLObjectSelection *get_null_object_selection()
 {
-        static LLObjectSelection null_selection;
-        return &null_selection;;
+        if (sNullSelection.isNull())
+        {
+                sNullSelection = new LLObjectSelection;
+        }
+        return sNullSelection;
 }