diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-04-20 14:11:54 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-04-20 14:11:54 -0700 |
| commit | 972a85270f8806d6a094f87c3689303f8e2e8a84 (patch) | |
| tree | ca8a7a04cc74f8f1c0722604a7d809f1be50a3c2 /indra/newview/lltexturectrl.cpp | |
| parent | fc4bc08c73f6266ec0fd006dd21fc72d30141c85 (diff) | |
| parent | 4b224286fe97de7399d0b72066d7646c65faabb6 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 6c38550049..0dd1ff5483 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -573,6 +573,7 @@ void LLFloaterTexturePicker::draw() if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL) { mGLTFMaterial = (LLFetchedGLTFMaterial*) gGLTFMaterialList.getMaterial(mImageAssetID); + llassert(mGLTFMaterial == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(gGLTFMaterialList.getMaterial(mImageAssetID)) != nullptr); } else { |