Second Life viewer sources 1.18.0.6

1 files changed, 11 insertions, 8 deletions

diff --git a/linden/indra/llmessage/llmessageconfig.h b/linden/indra/llmessage/llmessageconfig.h
index 1664ce6..ca09c27 100644
--- a/linden/indra/llmessage/llmessageconfig.h
+++ b/linden/indra/llmessage/llmessageconfig.h
@@ -31,21 +31,24 @@
 
 #include <string>
 
+class LLSD;
+
 class LLMessageConfig
 {
 public:
+        enum Flavor { NO_FLAVOR=0, LLSD_FLAVOR=1, TEMPLATE_FLAVOR=2 };
+        enum SenderTrust { NOT_SET=0, UNTRUSTED=1, TRUSTED=2 };
+                
         static void initClass(const std::string& server_name,
                                                   const std::string& config_dir);
-                // force loading of config file during startup process
-                // so it can be used for startup features
+        static void useConfig(const LLSD& config);
 
-        static bool isServerDefaultBuilderLLSD();
-        static bool isServerDefaultBuilderTemplate();
+        static Flavor getServerDefaultFlavor();
 
         // For individual messages
-        static bool isMessageBuiltLLSD(const std::string& msg_name);
-        static bool isMessageBuiltTemplate(const std::string& msg_name);
-        static bool isMessageTrusted(const std::string& msg_name);
-        static bool isValidUntrustedMessage(const std::string& msg_name);
+        static Flavor getMessageFlavor(const std::string& msg_name);
+        static SenderTrust getSenderTrustedness(const std::string& msg_name);
+        static bool isValidMessage(const std::string& msg_name);
+        static bool isCapBanned(const std::string& cap_name);
 };
 #endif // LL_MESSAGECONFIG_H