diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
| commit | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch) | |
| tree | 7695bb632502f24325f7044c69e30946e767abce /indra/newview/llimfloater.cpp | |
| parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
merge changes for vmrg-217
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index f5cda52d44..f67464078b 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -234,12 +234,6 @@ LLIMFloater::~LLIMFloater() //virtual BOOL LLIMFloater::postBuild() { - // User-resizable control panels in P2P sessions look ugly (EXT-3470). - if (mDialog == IM_NOTHING_SPECIAL || mDialog == IM_SESSION_P2P_INVITE) - { - getChild<LLLayoutStack>("im_panels")->setPanelUserResize("panel_im_control_panel", FALSE); - } - const LLUUID& other_party_id = LLIMModel::getInstance()->getOtherParticipantID(mSessionID); if (other_party_id.notNull()) { @@ -385,9 +379,6 @@ void LLIMFloater::onSlide() getChild<LLButton>("slide_left_btn")->setVisible(mControlPanel->getParent()->getVisible()); getChild<LLButton>("slide_right_btn")->setVisible(!mControlPanel->getParent()->getVisible()); - - LLLayoutStack* stack = getChild<LLLayoutStack>("im_panels"); - if (stack) stack->setAnimate(true); } //static |