diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
| commit | c2915a889987e64484c9794d55740e7f6ac8f9bd (patch) | |
| tree | e09a6050829fbc4b1f8fdae03f6c12742ba903ed /indra/newview/llgroupactions.cpp | |
| parent | 1e9a5c21e5493ad3dabec4d032bc0a627e2f725f (diff) | |
| parent | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (diff) | |
Merge viewer-2-0 into gooey
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 22658b4d65..7dd8ea694e 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -138,12 +138,7 @@ void LLGroupActions::startCall(const LLUUID& group_id) } // start the call - // *TODO: move this to LLIMMgr? - LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id); - if (session && session->mSessionInitialized) - gIMMgr->startCall(session_id); - else - gIMMgr->autoStartCallOnStartup(session_id); + gIMMgr->autoStartCallOnStartup(session_id); make_ui_sound("UISndStartIM"); } |