summaryrefslogtreecommitdiff
path: root/indra/llui/lleditmenuhandler.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-13 17:33:58 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-13 17:33:58 -0700
commitf480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (patch)
treea2331f2444183d4399323eec28343a5b8013ffb6 /indra/llui/lleditmenuhandler.cpp
parente0bfefbd63449c0fe5ef7964677948f012d51506 (diff)
parent0660cf0c987385dc2923bff389c7fa1bc0feec81 (diff)
Merge
Diffstat (limited to 'indra/llui/lleditmenuhandler.cpp')
-rw-r--r--indra/llui/lleditmenuhandler.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/lleditmenuhandler.cpp b/indra/llui/lleditmenuhandler.cpp
index 821afae8fd..245bce76f5 100644
--- a/indra/llui/lleditmenuhandler.cpp
+++ b/indra/llui/lleditmenuhandler.cpp
@@ -37,3 +37,10 @@
/* static */
LLEditMenuHandler* LLEditMenuHandler::gEditMenuHandler = NULL;
+LLEditMenuHandler::~LLEditMenuHandler()
+{
+ if (gEditMenuHandler == this)
+ {
+ gEditMenuHandler = NULL;
+ }
+}