Merge branch 'main' into webrtc-voice

1 files changed, 6 insertions, 3 deletions

diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h
index 1aa5d2e164..772b8fd607 100644
--- a/indra/llmessage/lltemplatemessagereader.h
+++ b/indra/llmessage/lltemplatemessagereader.h
@@ -99,24 +99,27 @@ public:
     virtual void copyToBuilder(LLMessageBuilder&) const;
 
     BOOL validateMessage(const U8* buffer, S32 buffer_size,
-                         const LLHost& sender, bool trusted = false);
+                         const LLHost& sender, bool trusted = false, bool custom = false);
     BOOL readMessage(const U8* buffer, const LLHost& sender);
 
     bool isTrusted() const;
     bool isBanned(bool trusted_source) const;
     bool isUdpBanned() const;
 
+    BOOL               decodeData(const U8* buffer, const LLHost& sender, bool custom = false);
+    LLMessageTemplate* getTemplate();
+
 private:
 
     void getData(const char *blockname, const char *varname, void *datap,
                  S32 size = 0, S32 blocknum = 0, S32 max_size = S32_MAX);
 
     BOOL decodeTemplate(const U8* buffer, S32 buffer_size,  // inputs
-                        LLMessageTemplate** msg_template ); // outputs
+                        LLMessageTemplate** msg_template, bool custom = false ); // outputs
 
     void logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted );
 
-    BOOL decodeData(const U8* buffer, const LLHost& sender );
+    //BOOL decodeData(const U8* buffer, const LLHost& sender );
 
     S32 mReceiveSize;
     LLMessageTemplate* mCurrentRMessageTemplate;