diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-10-13 09:58:20 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2023-10-13 09:58:20 -0700 |
| commit | 14c3730bf128a6f01825954ee67a06188e134526 (patch) | |
| tree | 56ed9301957d560f36fef437c693b9ffb17b84e0 /indra/newview | |
| parent | 94d8f669acc57d670000498edf22589f7b178af0 (diff) | |
DRTVWR-592: Fix unable to undo effect of local terrain debug setting without restarting viewer
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvlcomposition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp index c4bed85be7..8d55c80be8 100644 --- a/indra/newview/llvlcomposition.cpp +++ b/indra/newview/llvlcomposition.cpp @@ -115,7 +115,7 @@ void LLTerrainMaterials::setDetailAssetID(S32 asset, const LLUUID& id) // since we will be manipulating it later as needed. mDetailTextures[asset] = fetch_terrain_texture(id); LLPointer<LLFetchedGLTFMaterial>& mat = mDetailMaterials[asset]; - mat = gGLTFMaterialList.getMaterial(id); + mat = id.isNull() ? nullptr : gGLTFMaterialList.getMaterial(id); mMaterialTexturesSet[asset] = false; } |