summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-02-10 16:11:50 -0800
committersimon <none@none>2014-02-10 16:11:50 -0800
commitcb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch)
tree8270c7d248f542107472fff9f2eb10f30721e1ee /indra/llui/llscrolllistctrl.cpp
parent8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff)
parent4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff)
Merge downstream code with viewer-release
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rwxr-xr-xindra/llui/llscrolllistctrl.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index d290413f7a..594e1e150b 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1855,9 +1855,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);
- // MAINT-535 reversion test
- //LLUrlAction::clickAction(slurl, true);
+ LLUrlAction::clickAction(slurl, true);
}
void LLScrollListCtrl::copyNameToClipboard(std::string id, bool is_group)