From b36dc363061ec5bf6b092c14193198e9a5eef816 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 9 Mar 2007 01:09:20 +0000
Subject: svn merge -r 58902:58986
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llcommon/llliveappconfig.h | 66 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'indra/llcommon/llliveappconfig.h')

diff --git a/indra/llcommon/llliveappconfig.h b/indra/llcommon/llliveappconfig.h
index ceceda5b18..8875f3adc3 100644
--- a/indra/llcommon/llliveappconfig.h
+++ b/indra/llcommon/llliveappconfig.h
@@ -1,33 +1,33 @@
-/** 
- * @file llliveappconfig.h
- * @brief Configuration information for an LLApp that overrides indra.xml
- *
- * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.
- * $License$
- */
-
-#ifndef LLLIVEAPPCONFIG_H
-#define LLLIVEAPPCONFIG_H
-
-#include "lllivefile.h"
-
-class LLApp;
-
-class LLLiveAppConfig : public LLLiveFile
-{
-public:
-	// To use this, instantiate a LLLiveAppConfig object inside your main loop.
-	// The traditional name for it is live_config.
-	// Be sure to call live_config.checkAndReload() periodically.
-
-	LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period);
-	~LLLiveAppConfig();
-
-protected:
-	/*virtual*/ void loadFile();
-
-private:
-	LLApp* mApp;
-};
-
-#endif
+/** 
+ * @file llliveappconfig.h
+ * @brief Configuration information for an LLApp that overrides indra.xml
+ *
+ * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LLLIVEAPPCONFIG_H
+#define LLLIVEAPPCONFIG_H
+
+#include "lllivefile.h"
+
+class LLApp;
+
+class LLLiveAppConfig : public LLLiveFile
+{
+public:
+	// To use this, instantiate a LLLiveAppConfig object inside your main loop.
+	// The traditional name for it is live_config.
+	// Be sure to call live_config.checkAndReload() periodically.
+
+	LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period);
+	~LLLiveAppConfig();
+
+protected:
+	/*virtual*/ void loadFile();
+
+private:
+	LLApp* mApp;
+};
+
+#endif
-- 
cgit v1.2.3