summaryrefslogtreecommitdiff
path: root/indra/newview/llgrouplist.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-05 10:59:29 -0800
committerRichard Linden <none@none>2012-01-05 10:59:29 -0800
commit66fcc2da3925cd16939e4438dad749b2c22dbc27 (patch)
tree771fe7786750454ad478773d7045accb4a353b53 /indra/newview/llgrouplist.cpp
parent570d562f5871f40bd7f8c683db5316ffd0133335 (diff)
parent9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r--indra/newview/llgrouplist.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index f7ed1116cb..bbf66ca750 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -95,7 +95,7 @@ LLGroupList::LLGroupList(const Params& p)
LLGroupList::~LLGroupList()
{
gAgent.removeListener(this);
- delete mContextMenuHandle.get();
+ if (mContextMenuHandle.get()) mContextMenuHandle.get()->die();
}
// virtual