Crash at getDiscardLevel()

akleshchev · akleshchev · commit 5b55c8d980cd · 2024-11-20T13:47:46.000+02:00
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
@@ -1104,7 +1104,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
`@@ -1104,7 +1104,7 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)`
`1104`	`1104`	`imagep->mCreatePending = false;`
`1105`	`1105`	`mCreateTextureList.pop();`
`1106`	`1106`
`1107`		`- if (imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())`
	`1107`	`+ if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel())`
`1108`	`1108`	`{`
`1109`	`1109`	`LL_WARNS_ONCE("Texture") << "Texture will be downscaled immediately after loading." << LL_ENDL;`
`1110`	`1110`	`imagep->scaleDown();`