From f8e3d70c1dbc17b83bc7ee708dfc1efde908d5b3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 13 Jan 2012 16:33:59 +0100
Subject: [PATCH] Preserve minimum floater size for texture preview floater

---
 indra/newview/llpreviewtexture.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 6cba1f0e90..6b39e6ad84 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -562,6 +562,10 @@ void LLPreviewTexture::updateDimensions()
 			floater_target_height = mImage->getFullHeight() / 2 + 3 * CLIENT_RECT_VPAD + PREVIEW_BORDER + dimensions_panel->getRect().mTop + getChildView("desc")->getRect().getHeight();
 		}
 
+		// Preserve minimum floater size
+		floater_target_width = llmax(floater_target_width, getMinWidth());
+		floater_target_height = llmax(floater_target_height, getMinHeight());
+
 		// Resize floater
 		if (getHost())
 		{