diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-26 09:13:31 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-26 09:13:31 +0200 |
| commit | 5d7497aab21f9cfcd8b86c73c27dce33e8409841 (patch) | |
| tree | a7e1df0983f66826c195c20c229c39d1d786de9b /indra/newview/llavataractions.cpp | |
| parent | 12961b57014f099ad35bd9c2e4dfae1bc4a549c3 (diff) | |
| parent | a908a528fea9e51ca8c8d9e6cc7a7401991f160a (diff) | |
push
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index bb14c41cec..7eed2e7b9a 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -250,17 +250,20 @@ void LLAvatarActions::startAdhocCall(const std::vector<LLUUID>& ids) make_ui_sound("UISndStartIM"); } +/* AD *TODO: Is this function needed any more? + I fixed it a bit(added check for canCall), but it appears that it is not used + anywhere. Maybe it should be removed? // static bool LLAvatarActions::isCalling(const LLUUID &id) { - if (id.isNull()) + if (id.isNull() || !canCall()) { return false; } LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, id); return (LLIMModel::getInstance()->findIMSession(session_id) != NULL); -} +}*/ //static bool LLAvatarActions::canCall() |