From 4514b57126b2dae295602778589217f6e22451b8 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 18 Feb 2010 10:29:56 -0800 Subject: Backed out changeset: 744bd7c535fa --- indra/newview/llbottomtray.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index bbdaf5449f..8a7ed23b59 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -325,11 +325,6 @@ void LLBottomTray::setVisible(BOOL visible) } } } - - if(visible) - gFloaterView->setSnapOffsetBottom(getRect().getHeight()); - else - gFloaterView->setSnapOffsetBottom(0); } void LLBottomTray::showBottomTrayContextMenu(S32 x, S32 y, MASK mask) -- cgit v1.2.3 From 3af609b55c591ecc572c0872ba1b3013885d8ac9 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 18 Feb 2010 12:57:05 -0800 Subject: fixed some spacing munged by merge --- indra/newview/llbottomtray.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 463add9f4b..459a61dec3 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -117,7 +117,7 @@ public: if (gAgent.cameraMouselook()) { LLBottomTray::getInstance()->setVisible(FALSE); -} + } } LLNearbyChatBar* mNearbyChatBar; @@ -319,7 +319,7 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b } void LLBottomTray::onMouselookModeOut() - { +{ mIsInLiteMode = false; mBottomTrayLite->setVisible(FALSE); mNearbyChatBar->getChatBox()->setText(mBottomTrayLite->mNearbyChatBar->getChatBox()->getText()); @@ -350,10 +350,10 @@ void LLBottomTray::setVisible(BOOL visible) { mBottomTrayLite->setVisible(visible); } - else - { + else + { LLPanel::setVisible(visible); - } + } if(visible) gFloaterView->setSnapOffsetBottom(getRect().getHeight()); else @@ -566,7 +566,7 @@ void LLBottomTray::reshape(S32 width, S32 height, BOOL called_from_parent) { BOOL saved_anim = mToolbarStack->getAnimate(); // Set chiclet panel to be autoresized by default. - mToolbarStack->updatePanelAutoResize(PANEL_CHICLET_NAME, TRUE); + mToolbarStack->updatePanelAutoResize(PANEL_CHICLET_NAME, TRUE); // Disable animation to prevent layout updating in several frames. mToolbarStack->setAnimate(FALSE); // Force the updating of layout to reset panels collapse factor. @@ -1208,10 +1208,10 @@ bool LLBottomTray::setVisibleAndFitWidths(EResizeState object_type, bool visible // Nothing can be done, give up... return false; } - } + } if (result_width != current_width) - { + { cur_panel->reshape(result_width, cur_panel->getRect().getHeight()); current_width = result_width; } -- cgit v1.2.3