diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-07-27 15:43:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 15:43:58 -0700 |
| commit | 2e591ffbd581ba2a51c8eccb2b975452c4c31fe3 (patch) | |
| tree | 06970e34b3618478245092a111caa837236fcec6 /indra | |
| parent | 5e344813dc9bb4e5ecb8187642f97377c157955f (diff) | |
| parent | 5a706086fefa6058389dc35707fc6b0c8ccece2d (diff) | |
Merge pull request #311 from secondlife/SL-20053
SL-20053: Fix sometimes unable to unset a PBR material on a prim
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index b3310a1f9a..c13376d0a6 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -693,6 +693,11 @@ void LLFloaterTexturePicker::draw() const LLUUID& LLFloaterTexturePicker::findItemID(const LLUUID& asset_id, BOOL copyable_only, BOOL ignore_library) { + if (asset_id.isNull()) + { + return LLUUID::null; + } + LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLAssetIDMatches asset_id_matches(asset_id); |