summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.cpp
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2014-01-02 22:29:46 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2014-01-02 22:29:46 +0200
commitdd1bd943b9b0a91ccd4d7676bba5eb5277bf0fbe (patch)
tree605d3f65a9fe87164454e3a780801a3a08065b9e /indra/newview/llpreviewtexture.cpp
parent39e76aaea873094114471ff80203f941d108f7b8 (diff)
MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
-rwxr-xr-xindra/newview/llpreviewtexture.cpp3
1 files changed, 2 insertions, 1 deletions
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)
{