From dd1bd943b9b0a91ccd4d7676bba5eb5277bf0fbe Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Thu, 2 Jan 2014 22:29:46 +0200
Subject: MAINT-3592 (Viewer opening square textures should set the 1:1 size
 constraint)

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

(limited to 'indra/newview/llpreviewtexture.cpp')

diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 0ef7326678..50af5aea1f 100755
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -131,7 +131,7 @@ BOOL LLPreviewTexture::postBuild()
 
 	// Fill in ratios list with common aspect ratio values
 	mRatiosList.clear();
-	mRatiosList.push_back("Unconstrained");
+	mRatiosList.push_back(LLTrans::getString("Unconstrained"));
 	mRatiosList.push_back("1:1");
 	mRatiosList.push_back("4:3");
 	mRatiosList.push_back("10:7");
@@ -142,6 +142,7 @@ BOOL LLPreviewTexture::postBuild()
 	
 	// Now fill combo box with provided list
 	LLComboBox* combo = getChild<LLComboBox>("combo_aspect_ratio");
+	combo->removeall();
 
 	for (std::vector<std::string>::const_iterator it = mRatiosList.begin(); it != mRatiosList.end(); ++it)
 	{
-- 
cgit v1.2.3