diff options
author | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 10:59:31 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 10:59:31 +0000 |
commit | d5f3e6b2a82fa166179943fab435f69059f6686b (patch) | |
tree | d8a663de234a09315aaeaa95b42db4aafc0a9212 /indra/newview/llpanelimcontrolpanel.cpp | |
parent | 3cfd8a7ae8fb760fccfc992d8185db7bb37ff4ec (diff) | |
parent | 162924aadfb6a7312287d91a25a129885239c0a4 (diff) |
Automated merge with file:///home/lynx/hg/general/viewer-2-0
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 350b78ee3d..5a0c1164de 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -92,6 +92,14 @@ void LLPanelChatControlPanel::draw() && callback_enabled; childSetEnabled("call_btn", enable_connect); + // send a signal when the floater is fully initialized + // this lets LLAvatarActions::startAdhocCall() start the call + if (enable_connect && !mInitialized) + { + LLIMModel::sendSessionInitialized(mSessionId); + mInitialized = true; + } + LLPanel::draw(); } |