From 089fc07d207c71ce1401e72f09c31ad8c45872e2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:58 -0500
Subject: Second Life viewer sources 1.17.0.12

---
 linden/indra/newview/llviewerparcelmgr.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llviewerparcelmgr.cpp')

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;
 }
-- 
cgit v1.1