diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-23 18:19:13 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-23 18:19:13 +0300 |
| commit | 02e4068baaa7bcc49186e9a02a022f3d6cb087ac (patch) | |
| tree | 72b7b04cd4aacf80347b8908e7674ad32bf20ec9 | |
| parent | 41c85d357c8793f5119246b79441dd1dad9aa563 (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.
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llconversationloglistitem.cpp | 2 |
2 files changed, 4 insertions, 4 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: diff --git a/indra/newview/llconversationloglistitem.cpp b/indra/newview/llconversationloglistitem.cpp index 9f7c588989..dddf216592 100644 --- a/indra/newview/llconversationloglistitem.cpp +++ b/indra/newview/llconversationloglistitem.cpp @@ -168,7 +168,7 @@ void LLConversationLogListItem::onDoubleClick() break; case LLIMModel::LLIMSession::GROUP_SESSION: - LLGroupActions::startIM(mConversation->getParticipantID()); + LLGroupActions::startIM(mConversation->getSessionID()); break; default: |