diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/llui/llfloater.cpp | |
parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) |
merge changes for storm-1064
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; } |