Merge

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index a55915af35..342c0684da 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2373,13 +2373,16 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
 			new_width = llmax(new_width, min_width);
 			new_height = llmax(new_height, min_height);
 
-			LLRect new_rect;
-			new_rect.setLeftTopAndSize(view_rect.mLeft,view_rect.mTop,new_width, new_height);
-
 			floater->reshape( new_width, new_height, TRUE );
-			floater->setRect(new_rect);
+			if (floater->followsRight())
+			{
+				floater->translate(old_width - new_width, 0);
+			}
 
-			floater->translateIntoRect( getLocalRect(), false );
+			if (floater->followsTop())
+			{
+				floater->translate(0, old_height - new_height);
+			}
 		}
 	}