diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-07-07 08:06:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-07 08:06:22 -0400 |
| commit | 3d465f6c966f0a2fcfd5d3c9effb6ce20c2754c8 (patch) | |
| tree | 6e54cc193b39ab8ded12f4fa343ada52f75b0c61 /indra/llprimitive | |
| parent | f2c356fc7130ce5e38b994dcfa1e210609b458b9 (diff) | |
| parent | b8762cb7999197f7da36b4820761298e85bdfa6f (diff) | |
Merge pull request #5982 from secondlife/geenz/texture-streaming-tweaks
Geenz/texture streaming tweaks
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index ac482ffbf9..2b0f989701 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -600,7 +600,7 @@ LLGLTFMaterial* LLTextureEntry::getGLTFRenderMaterial() const return mGLTFRenderMaterial; } - llassert(getGLTFMaterialOverride() == nullptr || getGLTFMaterialOverride()->isClearedForBaseMaterial()); + //llassert(getGLTFMaterialOverride() == nullptr || getGLTFMaterialOverride()->isClearedForBaseMaterial()); return getGLTFMaterial(); } |