From 455bbcf742691b709353aa3c3e35a76d0ff38ee4 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 29 Aug 2023 16:42:55 -0500 Subject: SL-20229 Add GenericStreamingMessage and use it to receive GLTF material overrides --- indra/newview/llviewergenericmessage.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewergenericmessage.cpp') diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp index d3de9d72bf..7ea792c404 100644 --- a/indra/newview/llviewergenericmessage.cpp +++ b/indra/newview/llviewergenericmessage.cpp @@ -32,9 +32,10 @@ #include "lldispatcher.h" #include "lluuid.h" #include "message.h" +#include "llgenericstreamingmessage.h" #include "llagent.h" - +#include "llgltfmateriallist.h" LLDispatcher gGenericDispatcher; @@ -92,6 +93,21 @@ void process_generic_message(LLMessageSystem* msg, void**) } } +void process_generic_streaming_message(LLMessageSystem* msg, void**) +{ + LLGenericStreamingMessage data; + data.unpack(msg); + switch (data.mMethod) + { + case LLGenericStreamingMessage::METHOD_GLTF_MATERIAL_OVERRIDE: + gGLTFMaterialList.applyOverrideMessage(msg, data.mData); + break; + default: + LL_WARNS() << "GenericStreamingMessage received unknown method: " << data.mMethod << LL_ENDL; + break; + } +} + void process_large_generic_message(LLMessageSystem* msg, void**) { LLUUID agent_id; -- cgit v1.2.3 From 61ca550e64730afaaefd4db2234f886fb968f27e Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 19 Sep 2023 12:34:05 -0500 Subject: SL-20229 Fix for mac build (and don't spam log on viewers that don't know about a particular GenericStreamingMessage method) --- indra/newview/llviewergenericmessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewergenericmessage.cpp') diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp index 7ea792c404..aaa1313ff6 100644 --- a/indra/newview/llviewergenericmessage.cpp +++ b/indra/newview/llviewergenericmessage.cpp @@ -103,7 +103,7 @@ void process_generic_streaming_message(LLMessageSystem* msg, void**) gGLTFMaterialList.applyOverrideMessage(msg, data.mData); break; default: - LL_WARNS() << "GenericStreamingMessage received unknown method: " << data.mMethod << LL_ENDL; + LL_WARNS_ONCE() << "Received unknown method" << LL_ENDL; break; } } -- cgit v1.2.3