diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:40:14 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:40:14 -0800 |
| commit | 92f5e24c58f4a33e237c327c5266bb5fab6f9531 (patch) | |
| tree | 0754ea13c9773ec2dbeb779e1519f0c50a1d4361 /indra/newview/llcallfloater.cpp | |
| parent | b77fe6dc724c162b3de194d1b3f362ac4c7f5021 (diff) | |
| parent | 88a6cbdaecc06c0ff174d29ca9ff600775edff49 (diff) | |
PE Merge.
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); |