livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Paul ProductEngine 2012-08-23 18:19:13 +03:00
parent 41c85d357c
commit 02e4068baa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llconversationloglist.cpp
View File

@ -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:

2
indra/newview/llconversationloglistitem.cpp
View File

@ -168,7 +168,7 @@ void LLConversationLogListItem::onDoubleClick()
break;
case LLIMModel::LLIMSession::GROUP_SESSION:
LLGroupActions::startIM(mConversation->getParticipantID());
LLGroupActions::startIM(mConversation->getSessionID());
break;
default: