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

DEV-41324 DEV-41317: Fixes for P2P chat when already chatting.

meow-7.2.2
Lynx Linden 2009-11-11 15:45:24 +00:00
parent d5f3e6b2a8
commit 23a4637216
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llavataractions.cpp
View File

@ -191,7 +191,7 @@ void LLAvatarActions::startIM(const LLUUID& id)
// static
void LLAvatarActions::startCall(const LLUUID& id)
{
if (id.isNull() || isCalling(id))
if (id.isNull())
{
return;
}

2
indra/newview/llpanelpeople.cpp
View File

@ -1193,7 +1193,7 @@ void LLPanelPeople::onCallButtonClicked()
if (selected_uuids.size() == 1)
{
// initiate a P2P voice chat with the selected user
LLAvatarActions::startCall(selected_uuids[0]);
LLAvatarActions::startCall(getCurrentItemID());
}
else if (selected_uuids.size() > 1)
{