summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-04-05 15:12:12 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-04-05 15:12:12 -0700
commita0a7b7ed16a9161b8060e8f32e5594356e5c7329 (patch)
tree06809cac6cde316219cbcbf58a7381d907a9d5e6 /indra/llui/llscrolllistctrl.cpp
parent6b3ca581e037d52e507a69d82fd6d900bd4641b7 (diff)
parent9bfc1c3b1060f15990bba218795a1ef6009d1535 (diff)
Merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp5
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;
- }
}