summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmgr.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-06-04 18:46:59 +0000
committerJosh Bell <josh@lindenlab.com>2007-06-04 18:46:59 +0000
commite61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch)
treebcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llviewerparcelmgr.cpp
parent3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff)
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 5af3d532a6..556e0bc79b 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -2557,8 +2557,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;
}