Crash at getDiscardLevel()

akleshchev · akleshchev · commit 8d52d06fcbff · 2024-11-19T23:28:09.000+02:00
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
@@ -1061,7 +1061,7 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
         imagep->mCreatePending = false;
         mCreateTextureList.pop();
 
-        if (imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())
+        if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())
         {
             LL_WARNS_ONCE("Texture") << "Texture will be downscaled immediately after loading." << LL_ENDL;
             imagep->scaleDown();

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)`
`1061`	`1061`	`imagep->mCreatePending = false;`
`1062`	`1062`	`mCreateTextureList.pop();`
`1063`	`1063`
`1064`		`- if (imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())`
	`1064`	`+ if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())`
`1065`	`1065`	`{`
`1066`	`1066`	`LL_WARNS_ONCE("Texture") << "Texture will be downscaled immediately after loading." << LL_ENDL;`
`1067`	`1067`	`imagep->scaleDown();`