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

#4876 Fix material not applying 

1. Dupplicate call in llselectmgr can cause race conditions
2. lltooldragndrop wasn't updating server in one case
master
Andrey Kleshchev 2025-10-22 16:57:04 +03:00
parent 0fd96e6247
commit dab2fa75dd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llselectmgr.cpp
View File

@ -2073,7 +2073,6 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
objectp->clearTEWaterExclusion(te);
// Blank out most override data on the object and send to server
objectp->setRenderMaterialID(te, asset_id);
if (should_preserve_transforms && preserved_override)
{
// Apply material with preserved transforms

2
indra/newview/lltooldraganddrop.cpp
View File

@ -1537,7 +1537,7 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj,
}
else
{
hit_obj->setRenderMaterialID(te, asset_id, false, true);
hit_obj->setRenderMaterialID(te, asset_id);
}
}
}