diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-11-05 17:52:45 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-11-05 17:52:45 +0200 |
| commit | f8106e9f3fbf2f075bc01c93ec9681b7848bc742 (patch) | |
| tree | da17daa4f55e2712eef863905d8d7dd3eef7f6f7 /indra | |
| parent | 74d28082b00f8d4491ba58adc8a7e8f8adeb80e8 (diff) | |
SL-9991 FIXED Crash in LLViewerLODTexture::processTextureStats()
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 3c3b004d2c..1e9c9ce5e0 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -300,8 +300,8 @@ BOOL LLFloaterWorldMap::postBuild() landmark_combo->setTextChangedCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) ); mListLandmarkCombo = dynamic_cast<LLCtrlListInterface *>(landmark_combo); - mCurZoomVal = log(LLWorldMapView::sMapScale)/log(2.f); - getChild<LLUICtrl>("zoom slider")->setValue(LLWorldMapView::sMapScale); + mCurZoomVal = log(LLWorldMapView::sMapScale/256.f)/log(2.f); + getChild<LLUICtrl>("zoom slider")->setValue(mCurZoomVal); setDefaultBtn(NULL); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 2e366835d9..d5aa249883 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -3171,6 +3171,7 @@ void LLViewerLODTexture::processTextureStats() if (mKnownDrawWidth && mKnownDrawHeight) { S32 draw_texels = mKnownDrawWidth * mKnownDrawHeight; + draw_texels = llclamp(draw_texels, MIN_IMAGE_AREA, MAX_IMAGE_AREA); // Use log_4 because we're in square-pixel space, so an image // with twice the width and twice the height will have mTexelsPerImage |