diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 13:17:06 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 13:17:06 -0700 |
| commit | 18e5fa5bbd2f78b4fa6eee8b72666fa9aeb2100e (patch) | |
| tree | 2b18b184a4f6ea28db14ff796fb41ec300d8acd9 /indra/newview/llavataractions.cpp | |
| parent | 2301c7cff60eca879f605a3ee3f26b960597d8c3 (diff) | |
| parent | c43cfcdcbd243410e2f780f58f93100e96fc996c (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 3326103d03..7322b3bb0b 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -296,10 +296,14 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids, const LLUUID& float } const std::string title = LLTrans::getString("conference-title"); LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, ids[0], id_array, false, floater_id); - if (session_id != LLUUID::null) + + if (session_id == LLUUID::null) { - LLIMFloater::show(session_id); + return; } + + LLIMFloater::show(session_id); + make_ui_sound("UISndStartIM"); } |