summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationloglist.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-08-23 18:19:13 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-08-23 18:19:13 +0300
commit02e4068baaa7bcc49186e9a02a022f3d6cb087ac (patch)
tree72b7b04cd4aacf80347b8908e7674ad32bf20ec9 /indra/newview/llconversationloglist.cpp
parent41c85d357c8793f5119246b79441dd1dad9aa563 (diff)
CHUI-306 FIXED (Selecting IM option for Group in conversation log does not start an IM if you did not initiate the conversation)
- To start group call or group chat, group_id should be passed as an argument to LLGrupActions, not participant_id.
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
-rw-r--r--indra/newview/llconversationloglist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index 0433719a89..257ec082a5 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -193,7 +193,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata)
break;
case LLIMModel::LLIMSession::GROUP_SESSION:
- LLGroupActions::startIM(selected_id);
+ LLGroupActions::startIM(getSelectedConversation()->getSessionID());
break;
default:
@@ -209,7 +209,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata)
break;
case LLIMModel::LLIMSession::GROUP_SESSION:
- LLGroupActions::startCall(selected_id);
+ LLGroupActions::startCall(getSelectedConversation()->getSessionID());
break;
default:
@@ -225,7 +225,7 @@ void LLConversationLogList::onCustomAction(const LLSD& userdata)
break;
case LLIMModel::LLIMSession::GROUP_SESSION:
- LLGroupActions::show(selected_id);
+ LLGroupActions::show(getSelectedConversation()->getSessionID());
break;
default: