diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:22:31 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-27 12:22:31 +0100 |
| commit | 63200e2a5bfc7538fd8114464000f35798670f23 (patch) | |
| tree | 75cb9595ce06d0c460f700c96da053644f9bc733 /indra/newview/llworldview.cpp | |
| parent | 8eb3829ef7e22eb934a36476cba10d651b528bf2 (diff) | |
| parent | f33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (diff) | |
merge
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 665cc74a87..7261e63147 100644 --- a/indra/newview/llworldview.cpp +++ b/indra/newview/llworldview.cpp @@ -48,14 +48,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); } |