diff options
author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
commit | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch) | |
tree | 16341e6203400d52e89189d96206c26e899dbe44 /indra/llui/llscrolllistctrl.cpp | |
parent | b0c1dd4790847364ebcab1cb1d4103500f64072e (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
3.7.4. merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rwxr-xr-x | indra/llui/llscrolllistctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 6e03f604a2..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(); } @@ -1855,7 +1857,7 @@ void LLScrollListCtrl::showNameDetails(std::string id, bool is_group) // open the resident's details or the group details std::string sltype = is_group ? "group" : "agent"; std::string slurl = "secondlife:///app/" + sltype + "/" + id + "/about"; - LLUrlAction::clickAction(slurl); + LLUrlAction::clickAction(slurl, true); } void LLScrollListCtrl::copyNameToClipboard(std::string id, bool is_group) |