#4876 Fix material not applying

akleshchev · akleshchev · commit 6a5d4e0e3de5 · 2025-10-22T17:23:11.000+03:00
1. Dupplicate call in llselectmgr can cause race conditions
2. lltooldragndrop wasn't updating server in one case
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
@@ -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
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
@@ -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);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -2073,7 +2073,6 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)`
`2073`	`2073`
`2074`	`2074`	`objectp->clearTEWaterExclusion(te);`
`2075`	`2075`	`// Blank out most override data on the object and send to server`
`2076`		`- objectp->setRenderMaterialID(te, asset_id);`
`2077`	`2076`	`if (should_preserve_transforms && preserved_override)`
`2078`	`2077`	`{`
`2079`	`2078`	`// Apply material with preserved transforms`
Original file line number	Diff line number	Diff line change
`@@ -1537,7 +1537,7 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj,`
`1537`	`1537`	`}`
`1538`	`1538`	`else`
`1539`	`1539`	`{`
`1540`		`- hit_obj->setRenderMaterialID(te, asset_id, false, true);`
	`1540`	`+ hit_obj->setRenderMaterialID(te, asset_id);`
`1541`	`1541`	`}`
`1542`	`1542`	`}`
`1543`	`1543`	`}`