summaryrefslogtreecommitdiff
path: root/indra/llui/lleditmenuhandler.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-02 09:51:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-02 09:51:12 +0100
commit9c715190ef9497212834452dbfd3c28856e7b044 (patch)
treeb9e479e36ce72ce80bc026749ae5f8328e520004 /indra/llui/lleditmenuhandler.cpp
parentb1ae22c3eb71767219ebb96ec80011e10bbfabbe (diff)
parent18d9efff12ef8b59c648a801fe2c5c7e0bc8fde4 (diff)
merge from viewer-trunk
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;
+ }
+}