SL-18443 Allow nulling out of override data and implement new override message protocol.

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index ac519970b7..7dbe0652b1 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -7115,6 +7115,20 @@ const LLUUID& LLViewerObject::getRenderMaterialID(U8 te) const
 
 void LLViewerObject::setRenderMaterialID(U8 te, const LLUUID& id, bool update_server)
 {
+    if (update_server)
+    {
+        // clear out any existing override data and render material
+        getTE(te)->setGLTFMaterialOverride(nullptr);
+        getTE(te)->setGLTFRenderMaterial(nullptr);
+
+        LLCoros::instance().launch("modifyMaterialCoro", 
+            std::bind(&LLGLTFMaterialList::modifyMaterialCoro, 
+                gAgent.getRegionCapability("ModifyMaterialParams"), 
+                llsd::map(
+                    "object_id", getID(),
+                    "side", te)));
+    }
+
     if (id.notNull())
     {
         getTE(te)->setGLTFMaterial(gGLTFMaterialList.getMaterial(id));