diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-01-08 02:36:12 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-01-08 02:36:12 +0000 |
| commit | a773cdd6f7e95c44c2fc11e020addf60a970cb8f (patch) | |
| tree | 688c8b8c93397071bd8fd19c6004748aca4bfc9a | |
| parent | dd1bd943b9b0a91ccd4d7676bba5eb5277bf0fbe (diff) | |
Fix linux build
| -rwxr-xr-x | indra/newview/llpreviewtexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 50af5aea1f..5c41c5ad97 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); |