svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 39cc290b0f..7c00742122 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -464,8 +464,11 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
 
 void LLPreview::userSetShape(const LLRect& new_rect)
 {
-	userResized();
-	LLView::userSetShape(new_rect);
+	if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight())
+	{
+		userResized();
+	}
+	LLFloater::userSetShape(new_rect);
 }
 
 //
@@ -490,9 +493,12 @@ void LLMultiPreview::open()		/*Flawfinder: ignore*/
 
 void LLMultiPreview::userSetShape(const LLRect& new_rect)
 {
-	LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
-	if (frontmost_preview) frontmost_preview->userResized();
-	LLView::userSetShape(new_rect);
+	if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight())
+	{
+		LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
+		if (frontmost_preview) frontmost_preview->userResized();
+	}
+	LLFloater::userSetShape(new_rect);
 }