summaryrefslogtreecommitdiff
path: root/indra/llui/lleditmenuhandler.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
commit3da3ed2ccb9bab68be113bf7a79e6f95f7b73f9e (patch)
tree76bf2106cbbed09e02340b9cb0fa2fdee422b725 /indra/llui/lleditmenuhandler.cpp
parent9dcdbf029c3a74de5aefca52262d4ed41626298d (diff)
parentcf94709c60949d5376f8c5dc14bf5472631cd6c9 (diff)
merge
--HG-- branch : product-engine
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;
+ }
+}