diff options
author | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
commit | 752b3fdbe044069635a2c6cd000c481561985954 (patch) | |
tree | a162616b10fbabe65bf3a568c408e10e3cfd253a /indra/llui/llfloater.cpp | |
parent | b092de554c7745d7c3c19bd30803640f36431da2 (diff) | |
parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff) |
merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c425782715..35e0d9d890 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2590,9 +2590,13 @@ void LLFloaterView::draw() LLRect LLFloaterView::getSnapRect() const { - LLRect snap_rect = getRect(); - snap_rect.mBottom += mSnapOffsetBottom; - snap_rect.mRight -= mSnapOffsetRight; + LLRect snap_rect = getLocalRect(); + + LLView* snap_view = mSnapView.get(); + if (snap_view) + { + snap_view->localRectToOtherView(snap_view->getLocalRect(), &snap_rect, this); + } return snap_rect; } |