diff options
author | simon <none@none> | 2014-02-21 11:18:12 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-21 11:18:12 -0800 |
commit | ea944fd58f6fcaf29a939ed10e9fd5e07b9fb923 (patch) | |
tree | d18a3d5fc4f3220fc6d36d24e8cb1b05630e1f9f /indra/llui/llscrolllistctrl.cpp | |
parent | a23fc01c7b12299297124f4b5b6ad4e7a8145c00 (diff) | |
parent | 76913530ed04798536e8469dbeaea9e512d122aa (diff) |
Merge downstream code
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rwxr-xr-x | indra/llui/llscrolllistctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 594e1e150b..d4bbea0f8e 100755 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -320,7 +320,9 @@ LLScrollListCtrl::~LLScrollListCtrl() delete mSortCallback; std::for_each(mItemList.begin(), mItemList.end(), DeletePointer()); + mItemList.clear(); std::for_each(mColumns.begin(), mColumns.end(), DeletePairedPointer()); + mColumns.clear(); } |