SL-18583 Fix race condition when setting multiple faces

And fix cases of updates not applying

1 files changed, 19 insertions, 1 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index e4a67d7982..52b35d5158 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1812,6 +1812,14 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
                 // apply texture for the selected faces
                 //add(LLStatViewer::EDIT_TEXTURE, 1);
                 object->setRenderMaterialID(te, asset_id, false /*will be sent later*/);
+
+                // blank out any override data on the server
+                LLCoros::instance().launch("modifyMaterialCoro",
+                    std::bind(&LLGLTFMaterialList::modifyMaterialCoro,
+                        gAgent.getRegionCapability("ModifyMaterialParams"),
+                        llsd::map(
+                            "object_id", object->getID(),
+                            "side", te), nullptr));
             }
         }
     }
@@ -1948,7 +1956,15 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
                 objectp->setParameterEntryInUse(LLNetworkData::PARAMS_RENDER_MATERIAL, TRUE, false /*prevent an update*/);
             }
 
-            objectp->setRenderMaterialID(te, asset_id);
+            objectp->setRenderMaterialID(te, asset_id, false /*prevent an update to prevent a race condition*/);
+
+            // blank out any override data on the server
+            LLCoros::instance().launch("modifyMaterialCoro",
+                std::bind(&LLGLTFMaterialList::modifyMaterialCoro,
+                    gAgent.getRegionCapability("ModifyMaterialParams"),
+                    llsd::map(
+                        "object_id", objectp->getID(),
+                        "side", te), nullptr));
 
             return true;
         }
@@ -1978,6 +1994,8 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
             LLRenderMaterialParams* param_block = (LLRenderMaterialParams*)object->getParameterEntry(LLNetworkData::PARAMS_RENDER_MATERIAL);
             if (param_block)
             {
+                // To not cause multiple competing request that modify
+                // same param field send update only once per object
                 if (param_block->isEmpty())
                 {
                     object->setHasRenderMaterialParams(false);