diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-02 09:51:12 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-02 09:51:12 +0100 |
commit | 9c715190ef9497212834452dbfd3c28856e7b044 (patch) | |
tree | b9e479e36ce72ce80bc026749ae5f8328e520004 /indra/llui/llscrolllistctrl.cpp | |
parent | b1ae22c3eb71767219ebb96ec80011e10bbfabbe (diff) | |
parent | 18d9efff12ef8b59c648a801fe2c5c7e0bc8fde4 (diff) |
merge from viewer-trunk
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index bf0866a655..db0f2bd6e2 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -324,11 +324,6 @@ LLScrollListCtrl::~LLScrollListCtrl() delete mSortCallback; std::for_each(mItemList.begin(), mItemList.end(), DeletePointer()); - - if( gEditMenuHandler == this ) - { - gEditMenuHandler = NULL; - } } |