diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-01-26 21:38:29 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-01-26 21:38:29 +0200 |
| commit | e33483a7eee40615677b9abf1691c44dd80a961e (patch) | |
| tree | ca4e039401b14c559c0f28397c9fbd086e3f7642 /indra/newview/llcallfloater.cpp | |
| parent | d72748a0af3e77de9a5dfedd2b8c9d87bfe7da24 (diff) | |
Fixed normal bug EXT-4672 (Relog displays Voice Controls floater with Leave Call button)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 1e713dade8..f62fd44bc0 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -163,6 +163,8 @@ BOOL LLCallFloater::postBuild() //chrome="true" hides floater caption if (mDragHandle) mDragHandle->setTitleVisible(TRUE); + + updateSession(); return TRUE; } @@ -246,7 +248,7 @@ void LLCallFloater::updateSession() } } - const LLUUID& session_id = voice_channel->getSessionID(); + const LLUUID& session_id = voice_channel ? voice_channel->getSessionID() : LLUUID::null; lldebugs << "Set speaker manager for session: " << session_id << llendl; LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(session_id); |