diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/llui/llscrolllistctrl.cpp | |
parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) |
Merge with tip
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; - } } |