diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 11:57:28 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 11:57:28 +0000 |
| commit | 3888fed3f6da192dc714a584f976d542f1cf593c (patch) | |
| tree | d9798806fc869a81983356ac181f8fd51705b8df /indra/newview/llavataractions.cpp | |
| parent | 6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff) | |
| parent | b38388d131271de714a16764db7e9dc4f0751672 (diff) | |
merge.
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; } |