livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix linux build

meow-7.2.2
Simon Linden 2014-01-08 02:36:12 +00:00
parent dd1bd943b9
commit a773cdd6f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpreviewtexture.cpp
View File

@ -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);