Merge pull request #1726 from secondlife/roxie/webrtc-voice

Merge from main.

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index c1e0dd0a64..6eab86ff0a 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -40,8 +40,6 @@ class LLGLTFOverrideCacheEntry;
 class LLGLTFMaterialList
 {
 public:
-    static const LLUUID BLANK_MATERIAL_ASSET_ID;
-
     LLGLTFMaterialList() {}
 
 
@@ -81,14 +79,14 @@ public:
     static void flushUpdates(void(*done_callback)(bool) = nullptr);
 
     static void addSelectionUpdateCallback(void(*update_callback)(const LLUUID& object_id, S32 side));
-
+    
     // Queue an explicit LLSD ModifyMaterialParams update apply given override data
     //  overrides -- LLSD map (or array of maps) in the format:
     //      object_id   UUID(required)      id of object
     //      side        integer(required)   TE index of face to set, or -1 for all faces
     //      gltf_json   string(optional)    override data to set, empty string nulls out override data, omissions of this parameter keeps existing data
     //      asset_id    UUID(optional)      id of material asset to set, omission of this parameter keeps existing material asset id
-    //
+    //    
     // NOTE: Unless you already have a gltf_json string you want to send, strongly prefer using queueModify
     // If the queue/flush API is insufficient, extend it.
     static void queueUpdate(const LLSD& data);