diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 19:59:57 +0200 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 19:59:57 +0200 |
commit | 9b0404c4b5c99be3ab3591c7677f95f987056795 (patch) | |
tree | 3c5c5f99004673533b860e17442a07b955aa6fb0 /indra/newview/llfloaterimcontainer.cpp | |
parent | 3781615afa6db7289f26f404885ac614c7f1cee0 (diff) | |
parent | 418b0334f2ee92ce8b8958218c8d6db5ccc855f2 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 54e5085490..5a284cc7b7 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1118,19 +1118,18 @@ void LLFloaterIMContainer::doToSelected(const LLSD& userdata) void LLFloaterIMContainer::doToSelectedGroup(const LLSD& userdata) { std::string action = userdata.asString(); - LLUUID selected_group = getCurSelectedViewModelItem()->getUUID(); if (action == "group_profile") { - LLGroupActions::show(selected_group); + LLGroupActions::show(mSelectedSession); } else if (action == "activate_group") { - LLGroupActions::activate(selected_group); + LLGroupActions::activate(mSelectedSession); } else if (action == "leave_group") { - LLGroupActions::leave(selected_group); + LLGroupActions::leave(mSelectedSession); } } |