diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
| commit | cfc43ff67ce7a254fd7be2f284a1d9f7a318f3fb (patch) | |
| tree | 49a779a442b63054c8dd6386a4f568c299e72006 /indra/newview/llimfloater.cpp | |
| parent | 3689b28bf7066a750d24dbb34a809a6d2fa953ed (diff) | |
| parent | cabf4f5d58410e9c1fb8c06b0f40900119d37fa7 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 4a18c8640f..1eac90371d 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -515,7 +515,7 @@ BOOL LLIMFloater::getVisible() if(isChatMultiTab()) { LLIMFloaterContainer* im_container = LLIMFloaterContainer::getInstance(); - // Tabbed IM window is "visible" when we minimize it. + // getVisible() returns TRUE when Tabbed IM window is minimized. return !im_container->isMinimized() && im_container->getVisible(); } else @@ -572,6 +572,12 @@ void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id) setKey(im_session_id); mControlPanel->setSessionId(im_session_id); } + + // updating "Call" button from group control panel here to enable it without placing into draw() (EXT-4796) + if(gAgent.isInGroup(im_session_id)) + { + mControlPanel->updateCallButton(); + } //*TODO here we should remove "starting session..." warning message if we added it in postBuild() (IB) |