diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
| commit | 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 (patch) | |
| tree | d7a8f7846af7dc948d9e11c5a75dd830fb12465c /indra/newview/llviewerwindow.cpp | |
| parent | a1cde743e755d826c86aeb006d2027ad2e5c8ce3 (diff) | |
svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index dcceb397d3..900fd6fc8b 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1802,9 +1802,11 @@ void adjust_rect_bottom_center(const LLString& control, const LLRect& window) LLRect r = gSavedSettings.getRect(control); if (r.mLeft == 0 && r.mBottom == 0) { + // *TODO: Adjust based on XUI XML + const S32 TOOLBAR_HEIGHT = 64; r.setOriginAndSize( window.getWidth()/2 - r.getWidth()/2, - 0, + TOOLBAR_HEIGHT, r.getWidth(), r.getHeight()); gSavedSettings.setRect(control, r); @@ -1838,9 +1840,9 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window) { LLRect r; - adjust_rect_bottom_center("FloaterMoveRect", window); + adjust_rect_bottom_center("FloaterMoveRect2", window); - adjust_rect_bottom_center("FloaterCameraRect", window); + adjust_rect_bottom_center("FloaterCameraRect2", window); adjust_rect_top_left("FloaterCustomizeAppearanceRect", window); @@ -1856,8 +1858,6 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window) adjust_rect_top_right("FloaterLagMeter", window); - adjust_rect_top_right("FloaterLagMeter", window); - adjust_rect_top_left("FloaterBuildOptionsRect", window); // bottom-right |