Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/llmessage/llmessageconfig.h b/indra/llmessage/llmessageconfig.h
index 1b39c386ca..ce308faa1b 100644
--- a/indra/llmessage/llmessageconfig.h
+++ b/indra/llmessage/llmessageconfig.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmessageconfig.h
  * @brief Live file handling for messaging
  *
  * $LicenseInfo:firstyear=2000&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -35,22 +35,22 @@ 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);
-	static void useConfig(const LLSD& config);
+    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);
+    static void useConfig(const LLSD& config);
 
-	static Flavor getServerDefaultFlavor();
-	 static S32 getMaxQueuedEvents();
+    static Flavor getServerDefaultFlavor();
+     static S32 getMaxQueuedEvents();
 
-	// For individual messages
-	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 onlySendLatest(const std::string& msg_name);
-	static bool isCapBanned(const std::string& cap_name);
-	static LLSD getConfigForMessage(const std::string& msg_name);
+    // For individual messages
+    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 onlySendLatest(const std::string& msg_name);
+    static bool isCapBanned(const std::string& cap_name);
+    static LLSD getConfigForMessage(const std::string& msg_name);
 };
 #endif // LL_MESSAGECONFIG_H