aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:29 -0500
committerJacek Antonelli2008-08-15 23:45:29 -0500
commit7bdb4845afdd157f95281293803567090e3f992a (patch)
treefbcada1c227d7407f9f37ccba360bfe6326d9c5e /linden/indra/newview/llviewerwindow.cpp
parentSecond Life viewer sources 1.19.0.0 (diff)
downloadmeta-impy-7bdb4845afdd157f95281293803567090e3f992a.zip
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.gz
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.bz2
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.xz
Second Life viewer sources 1.19.0.2
Diffstat (limited to 'linden/indra/newview/llviewerwindow.cpp')
-rw-r--r--linden/indra/newview/llviewerwindow.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index a8ff246..b0577e6 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -3000,7 +3000,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
3000 } 3000 }
3001 3001
3002 // Update rectangles for the various toolbars 3002 // Update rectangles for the various toolbars
3003 if (gOverlayBar && gNotifyBoxView && gConsole) 3003 if (gOverlayBar && gNotifyBoxView && gConsole && gToolBar)
3004 { 3004 {
3005 LLRect bar_rect(-1, STATUS_BAR_HEIGHT, getWindowWidth()+1, -1); 3005 LLRect bar_rect(-1, STATUS_BAR_HEIGHT, getWindowWidth()+1, -1);
3006 3006
@@ -3022,7 +3022,8 @@ BOOL LLViewerWindow::handlePerFrameHover()
3022 3022
3023 // snap floaters to top of chat bar/button strip 3023 // snap floaters to top of chat bar/button strip
3024 LLView* chatbar_and_buttons = gOverlayBar->getChildByName("chatbar_and_buttons", TRUE); 3024 LLView* chatbar_and_buttons = gOverlayBar->getChildByName("chatbar_and_buttons", TRUE);
3025 if (chatbar_and_buttons) 3025 // find top of chatbar and strate buttons, if either are visible
3026 if (chatbar_and_buttons && !chatbar_and_buttons->getLocalBoundingRect().isNull())
3026 { 3027 {
3027 // convert top/left corner of chatbar/buttons container to gFloaterView-relative coordinates 3028 // convert top/left corner of chatbar/buttons container to gFloaterView-relative coordinates
3028 S32 top, left; 3029 S32 top, left;
@@ -3034,6 +3035,17 @@ BOOL LLViewerWindow::handlePerFrameHover()
3034 gFloaterView); 3035 gFloaterView);
3035 gFloaterView->setSnapOffsetBottom(top); 3036 gFloaterView->setSnapOffsetBottom(top);
3036 } 3037 }
3038 else if (gToolBar->getVisible())
3039 {
3040 S32 top, left;
3041 gToolBar->localPointToOtherView(
3042 gToolBar->getLocalBoundingRect().mLeft,
3043 gToolBar->getLocalBoundingRect().mTop,
3044 &left,
3045 &top,
3046 gFloaterView);
3047 gFloaterView->setSnapOffsetBottom(top);
3048 }
3037 else 3049 else
3038 { 3050 {
3039 gFloaterView->setSnapOffsetBottom(0); 3051 gFloaterView->setSnapOffsetBottom(0);