diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
| commit | 990e31bb692b62e05f6065b04207acb8ca50cce4 (patch) | |
| tree | 8bb88d17e763d1a0be37f3c3ff1056f5306a4e77 /indra/newview/llworldview.cpp | |
| parent | 46de549bfba0b95b068b617026e095404ccff2f6 (diff) | |
| parent | f33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (diff) | |
Merge from default branch.
Incoming changes in (924d091c166c) moved SidebarCameraMovement logic out of special widget to camera setup code
are reset changes in (380b2422b864) EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" variable
But seems bug is not reproduced.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llworldview.cpp')
| -rw-r--r-- | indra/newview/llworldview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llworldview.cpp b/indra/newview/llworldview.cpp index 6336f8895a..b44a365677 100644 --- a/indra/newview/llworldview.cpp +++ b/indra/newview/llworldview.cpp @@ -49,14 +49,14 @@ LLWorldView::LLWorldView(const Params& p) void LLWorldView::reshape(S32 width, S32 height, BOOL called_from_parent) { - if (FALSE == gSavedSettings.getBOOL("SidebarCameraMovement") ) - { - LLView* main_view = LLUI::getRootView()->findChild<LLView>("main_view"); - if(main_view) - { - width = main_view->getRect().getWidth(); - } - } + //if (FALSE == gSavedSettings.getBOOL("SidebarCameraMovement") ) + //{ + // LLView* main_view = LLUI::getRootView()->findChild<LLView>("main_view"); + // if(main_view) + // { + // width = main_view->getRect().getWidth(); + // } + //} LLUICtrl::reshape(width, height, called_from_parent); } |