summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-03 18:26:53 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-03 18:26:53 +0000
commit7bb35543c1021c1a286a75684aeb5014eb104f4b (patch)
treefddde75884f5cccb1b83a60c6495370cc86dbb87 /indra/newview/llimfloater.cpp
parent011673de5a73eefbd59e29056851e160338be714 (diff)
parentf7594c713d93f397440c4af2f566a33f1b6af099 (diff)
merge.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 36f7304074..1eac90371d 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -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)