diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:36:24 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:36:24 +0000 |
| commit | 4acc05b3793623a03ea763c5c8c4072f986ee286 (patch) | |
| tree | 3b674c554ccfa9348861d773531a7ef8b04a53e4 /indra/newview/llavataractions.cpp | |
| parent | dd9abe71c25f1ed03771005e8ca3f7fb0aaef5b2 (diff) | |
| parent | e5a2b1c458a86006959b924986288c48689a9bd3 (diff) | |
merge latest batch of stuff from viewer2voiceparity
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index f631978565..ee4a9df15f 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -192,7 +192,7 @@ void LLAvatarActions::startIM(const LLUUID& id) // static void LLAvatarActions::startCall(const LLUUID& id) { - if (id.isNull() || isCalling(id)) + if (id.isNull()) { return; } |