diff options
author | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
commit | 34c12d009c232917732e6eeb452da7e76b2ee12e (patch) | |
tree | 847155313ac7588a23f3ee71d3ee8f3ab30580c9 /indra/llui/llscrolllistctrl.cpp | |
parent | 7b9817cbcc5acab58d9d4355984b429850bd3ef8 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
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) |