livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #311 from secondlife/SL-20053 

SL-20053: Fix sometimes unable to unset a PBR material on a prim
master
cosmic-linden 2023-07-27 15:43:58 -07:00 committed by GitHub
parent 5e344813dc 5a706086fe
commit 2e591ffbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lltexturectrl.cpp
View File

@ -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);