diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-22 15:37:31 -0500 |
| commit | 53698d5c10a868abd883a0a4b4222d2e2d4bab96 (patch) | |
| tree | 9a4c50e17c4d8e0de094c4352ec9df5944240c02 /indra/newview/llgroupactions.cpp | |
| parent | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (diff) | |
| parent | 0a98034641267ea57360fdd369acb8b94ff9bc20 (diff) | |
automated merge PE->viewer2.0
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"); } |