diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-12 16:47:15 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-12 16:47:15 -0800 |
| commit | 92cacc5581dc52058a65e305d8530f9da1445480 (patch) | |
| tree | d06658448ef5aba5e9dfaca9be724d9e732ae022 /indra/newview/llimfloater.cpp | |
| parent | fd9257a5f2649d7afbf65067c0fa4653fc81272c (diff) | |
| parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) | |
Merge with product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 54fc6f02fb..5ea900e46d 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -211,6 +211,7 @@ BOOL LLIMFloater::postBuild() } mControlPanel->setSessionId(mSessionID); + mControlPanel->setVisible(gSavedSettings.getBOOL("IMShowControlPanel")); LLButton* slide_left = getChild<LLButton>("slide_left_btn"); slide_left->setVisible(mControlPanel->getVisible()); @@ -356,8 +357,6 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id) LLDockControl::TOP, boost::bind(&LLIMFloater::getAllowedRect, floater, _1))); } - floater->childSetVisible("panel_im_control_panel", gSavedSettings.getBOOL("IMShowControlPanel")); - return floater; } |