From e39fc95659a405a8500c9014d2ac31c5d85741d7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Mar 2010 00:54:46 +0000
Subject: Fix LocalPresenceServiceConnector test now that the hardcoded test
 data has been removed from Data.Null.NullPresenceData Unfortunately, this
 meant publicly exposing the underlying service for the connector. The other
 solution would be to create alternative initializers for services and
 connectors where objects could be given directly rather than loaded
 indirectly through config. Unfortunately, this would require a lot of work in
 this case but might be the better way forward.

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 8f19417..4ca6595 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -42,6 +42,8 @@ namespace OpenSim
     /// </summary>
     public class ConfigurationLoader
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         /// <summary>
         /// Various Config settings the region needs to start
         /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 
@@ -61,17 +63,6 @@ namespace OpenSim
         protected NetworkServersInfo m_networkServersInfo;
 
         /// <summary>
-        /// Console logger
-        /// </summary>
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-
-        public ConfigurationLoader()
-        {
-        }
-
-        /// <summary>
         /// Loads the region configuration
         /// </summary>
         /// <param name="argvSource">Parameters passed into the process when started</param>
@@ -188,7 +179,6 @@ namespace OpenSim
             }
 
             // Make sure command line options take precedence
-            //
             m_config.Source.Merge(argvSource);
 
             ReadConfigSettings();
-- 
cgit v1.1