diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-11 00:18:00 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-11 00:18:00 +0300 |
| commit | c59aeef9664a1d9b6357a66a6eff0eab6d24b3eb (patch) | |
| tree | fa420d33769aa228ad1baed285028470d5b12be3 | |
| parent | 2aca9b39d467f48984c246d93e3393b9851929db (diff) | |
CHUI-921 FIXED Default position of open floaters starts at left edge of viewer behind toolbar
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 09e27a264a..5873df5169 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2788,7 +2788,7 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out } // move window fully onscreen - if (floater->translateIntoRect( getSnapRect(), allow_partial_outside ? FLOATER_MIN_VISIBLE_PIXELS : S32_MAX )) + if (floater->translateIntoRect( gFloaterView->getRect(), allow_partial_outside ? FLOATER_MIN_VISIBLE_PIXELS : S32_MAX )) { floater->clearSnapTarget(); } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index be508ad17d..45ff75bb34 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1798,6 +1798,7 @@ void LLViewerWindow::initBase() // Constrain floaters to inside the menu and status bar regions. gFloaterView = main_view->getChild<LLFloaterView>("Floater View"); + gFloaterView->setFloaterSnapView(main_view->getChild<LLView>("floater_snap_region")->getHandle()); gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View"); // Console |