From a773cdd6f7e95c44c2fc11e020addf60a970cb8f Mon Sep 17 00:00:00 2001
From: Simon Linden <simon@lindenlab.com>
Date: Wed, 8 Jan 2014 02:36:12 +0000
Subject: [PATCH] Fix linux build
---
indra/newview/llpreviewtexture.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 50af5aea1f8..5c41c5ad972 100755
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -71,8 +71,7 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key)
mAspectRatio(0.f),
mPreviewToSave(FALSE),
mImage(NULL),
- mImageOldBoostLevel(LLGLTexture::BOOST_NONE),
- mRatiosList(NULL)
+ mImageOldBoostLevel(LLGLTexture::BOOST_NONE)
{
updateImageID();
if (key.has("save_as"))
@@ -551,8 +550,9 @@ void LLPreviewTexture::adjustAspectRatio()
LLComboBox* combo = getChild<LLComboBox>("combo_aspect_ratio");
if (combo)
{
- std::string ratio = std::to_string((ULONGLONG)num) + ":" + std::to_string((ULONGLONG)denom);
- std::vector<std::string>::const_iterator found = std::find(mRatiosList.begin(), mRatiosList.end(), ratio);
+ std::ostringstream ratio;
+ ratio << num << ":" << denom;
+ std::vector<std::string>::const_iterator found = std::find(mRatiosList.begin(), mRatiosList.end(), ratio.str());
if (found == mRatiosList.end())
{
combo->setCurrentByIndex(0);
--
GitLab