summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-20 10:13:24 -0800
commitf38fa6a7357a91fcede3713cfce4971f0b0d5dfa (patch)
tree07ccb7b989cce22cfae95841802fc74d0749c040 /indra/llui/llfloater.cpp
parentf009fbcb03e7d4e87d41f60e2873ffcbcb02354b (diff)
parent8758fac7124ff07f2a003bf5719c19a4dab170b9 (diff)
PE merge.
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 3734a22f7e..4f519afa06 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2388,10 +2388,12 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
new_height = llmax(new_height, min_height);
LLRect new_rect;
- new_rect.setLeftTopAndSize(view_rect.mTop,view_rect.mLeft,new_width, new_height);
+ new_rect.setLeftTopAndSize(view_rect.mLeft,view_rect.mTop,new_width, new_height);
floater->reshape( new_width, new_height, TRUE );
floater->setRect(new_rect);
+
+ floater->translateIntoRect( getLocalRect(), false );
}
}