summaryrefslogtreecommitdiff
path: root/indra/llui/lleditmenuhandler.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
commit16b22d4abe99f8b43628db9db8142d65f431b062 (patch)
tree079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/llui/lleditmenuhandler.cpp
parentf4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff)
parent7d38dd51c2a59d173bee9c04737002313f4b9dec (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;
+ }
+}