summaryrefslogtreecommitdiff
path: root/indra/llui/lleditmenuhandler.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
commit873de2daae04a63c796661ff6d4db6aa912041bf (patch)
tree1e44c8c87fc8c86013a8843c572ec6fac4409eab /indra/llui/lleditmenuhandler.cpp
parent580ecaefcac2eb928c3dbdc9240e3fb54f3c989f (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
automated 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;
+ }
+}