diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 16:45:44 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 16:45:44 +0000 |
| commit | 4c3878ee9238318924067def7d186dbf0acbf51e (patch) | |
| tree | 0e8ab133a571ba51fbd65bb903afdc97da18b7d9 /indra | |
| parent | 71fd3852b026ab98438ce87be89c98944a76b8a5 (diff) | |
| parent | 23a4637216403d04822efd9125875e5b06b4ccca (diff) | |
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 4456e0aa74..47237e53cc 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -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; } diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 9ba94c8ca9..2bbb2b7153 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -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) { |