2 files changed, 283 insertions, 283 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 6f2b354..f16bc46 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -1,135 +1,135 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSimulator Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using log4net;

-using Nini.Config;

-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using OpenSim.Framework;

-using OpenSim.Server.Base;

-using OpenSim.Region.Framework.Interfaces;

-using OpenSim.Region.Framework.Scenes;

-using OpenSim.Services.Interfaces;

-

-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour

-{

-    public class LocalNeighbourServicesConnector :

-            ISharedRegionModule, INeighbourService

-    {

-        private static readonly ILog m_log =

-                LogManager.GetLogger(

-                MethodBase.GetCurrentMethod().DeclaringType);

-

-        private List<Scene> m_Scenes = new List<Scene>();

-

-        private bool m_Enabled = false;

-

-        public LocalNeighbourServicesConnector()

-        {

-        }

-

-        public LocalNeighbourServicesConnector(List<Scene> scenes)

-        {

-            m_Scenes = scenes;

-        }

-

-        #region ISharedRegionModule

-

-        public string Name

-        {

-            get { return "LocalNeighbourServicesConnector"; }

-        }

-

-        public void Initialise(IConfigSource source)

-        {

-            IConfig moduleConfig = source.Configs["Modules"];

-            if (moduleConfig != null)

-            {

-                string name = moduleConfig.GetString("NeighbourServices", this.Name);

-                if (name == Name)

-                {

-                    // m_Enabled rules whether this module registers as INeighbourService or not

-                    m_Enabled = true;

-                    m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled");

-                }

-            }

-        }

-

-        public void Close()

-        {

-        }

-

-        public void AddRegion(Scene scene)

-        {

-            m_Scenes.Add(scene);

-

-            if (!m_Enabled)

-                return;

-

-            scene.RegisterModuleInterface<INeighbourService>(this);

-        }

-

-        public void RegionLoaded(Scene scene)

-        {

-            m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled for region " + scene.RegionInfo.RegionName);

-        }

-

-        public void PostInitialise()

-        {

-        }

-

-        public void RemoveRegion(Scene scene)

-        {

-            // Always remove 

-            if (m_Scenes.Contains(scene))

-                m_Scenes.Remove(scene);

-        }

-

-        #endregion ISharedRegionModule

-

-        #region INeighbourService

-

-        public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)

-        {

-            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",

-                thisRegion.RegionName, regionHandle, m_Scenes.Count);

-            foreach (Scene s in m_Scenes)

-            {

-                if (s.RegionInfo.RegionHandle == regionHandle)

-                {

-                    m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");

-                    return s.IncomingHelloNeighbour(thisRegion);

-                }

-            }

-            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);

-            return false;

-        }

-

-        #endregion INeighbourService

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
+{
+    public class LocalNeighbourServicesConnector :
+            ISharedRegionModule, INeighbourService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private List<Scene> m_Scenes = new List<Scene>();
+
+        private bool m_Enabled = false;
+
+        public LocalNeighbourServicesConnector()
+        {
+        }
+
+        public LocalNeighbourServicesConnector(List<Scene> scenes)
+        {
+            m_Scenes = scenes;
+        }
+
+        #region ISharedRegionModule
+
+        public string Name
+        {
+            get { return "LocalNeighbourServicesConnector"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("NeighbourServices", this.Name);
+                if (name == Name)
+                {
+                    // m_Enabled rules whether this module registers as INeighbourService or not
+                    m_Enabled = true;
+                    m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled");
+                }
+            }
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_Scenes.Add(scene);
+
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<INeighbourService>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            m_log.Info("[NEIGHBOUR CONNECTOR]: Local neighbour connector enabled for region " + scene.RegionInfo.RegionName);
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            // Always remove 
+            if (m_Scenes.Contains(scene))
+                m_Scenes.Remove(scene);
+        }
+
+        #endregion ISharedRegionModule
+
+        #region INeighbourService
+
+        public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        {
+            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
+                thisRegion.RegionName, regionHandle, m_Scenes.Count);
+            foreach (Scene s in m_Scenes)
+            {
+                if (s.RegionInfo.RegionHandle == regionHandle)
+                {
+                    m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
+                    return s.IncomingHelloNeighbour(thisRegion);
+                }
+            }
+            m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
+            return false;
+        }
+
+        #endregion INeighbourService
+    }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index 9145d11..d584a98 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -1,148 +1,148 @@
-/*

- * Copyright (c) Contributors, http://opensimulator.org/

- * See CONTRIBUTORS.TXT for a full list of copyright holders.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *     * Redistributions of source code must retain the above copyright

- *       notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above copyright

- *       notice, this list of conditions and the following disclaimer in the

- *       documentation and/or other materials provided with the distribution.

- *     * Neither the name of the OpenSimulator Project nor the

- *       names of its contributors may be used to endorse or promote products

- *       derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-using log4net;

-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using Nini.Config;

-using OpenSim.Framework;

-using OpenSim.Services.Connectors;

-using OpenSim.Region.Framework.Interfaces;

-using OpenSim.Region.Framework.Scenes;

-using OpenSim.Services.Interfaces;

-using OpenSim.Server.Base;

-

-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour

-{

-    public class RemoteNeighbourServicesConnector :

-            NeighbourServicesConnector, ISharedRegionModule, INeighbourService

-    {

-        private static readonly ILog m_log =

-                LogManager.GetLogger(

-                MethodBase.GetCurrentMethod().DeclaringType);

-

-        private bool m_Enabled = false;

-        private LocalNeighbourServicesConnector m_LocalService;

-        private string serviceDll;

-        private List<Scene> m_Scenes = new List<Scene>();

-

-        public string Name

-        {

-            get { return "RemoteNeighbourServicesConnector"; }

-        }

-

-        public void Initialise(IConfigSource source)

-        {

-            IConfig moduleConfig = source.Configs["Modules"];

-            if (moduleConfig != null)

-            {

-                string name = moduleConfig.GetString("NeighbourServices");

-                if (name == Name)

-                {

-                    m_LocalService = new LocalNeighbourServicesConnector();

-

-                    //IConfig neighbourConfig = source.Configs["NeighbourService"];

-                    //if (neighbourConfig == null)

-                    //{

-                    //    m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini");

-                    //    return;

-                    //}

-                    //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty);

-                    //if (serviceDll == String.Empty)

-                    //{

-                    //    m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService");

-                    //    return;

-                    //}

-

-                    m_Enabled = true;

-

-                    m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled");

-                }

-            }

-        }

-

-        public void PostInitialise()

-        {

-            //if (m_Enabled)

-            //{

-            //    Object[] args = new Object[] { m_Scenes };

-            //    m_LocalService =

-            //            ServerUtils.LoadPlugin<INeighbourService>(serviceDll,

-            //            args);

-

-            //    if (m_LocalService == null)

-            //    {

-            //        m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service");

-            //        Unregister();

-            //        return;

-            //    }

-            //}

-        }

-

-        public void Close()

-        {

-        }

-

-        public void AddRegion(Scene scene)

-        {

-            if (!m_Enabled)

-                return;

-

-            m_MapService = scene.CommsManager.GridService;

-            m_LocalService.AddRegion(scene);

-            scene.RegisterModuleInterface<INeighbourService>(this);

-        }

-

-        public void RemoveRegion(Scene scene)

-        {

-            if (m_Enabled && m_Scenes.Contains(scene))

-                m_LocalService.RemoveRegion(scene);

-        }

-

-        public void RegionLoaded(Scene scene)

-        {

-            if (!m_Enabled)

-                return;

-

-            m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName);

-

-        }

-

-        #region INeighbourService

-

-        public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)

-        {

-            if (m_LocalService.HelloNeighbour(regionHandle, thisRegion))

-                return true;

-

-            return base.HelloNeighbour(regionHandle, thisRegion);

-        }

-

-        #endregion INeighbourService

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Services.Connectors;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
+{
+    public class RemoteNeighbourServicesConnector :
+            NeighbourServicesConnector, ISharedRegionModule, INeighbourService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private bool m_Enabled = false;
+        private LocalNeighbourServicesConnector m_LocalService;
+        private string serviceDll;
+        private List<Scene> m_Scenes = new List<Scene>();
+
+        public string Name
+        {
+            get { return "RemoteNeighbourServicesConnector"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("NeighbourServices");
+                if (name == Name)
+                {
+                    m_LocalService = new LocalNeighbourServicesConnector();
+
+                    //IConfig neighbourConfig = source.Configs["NeighbourService"];
+                    //if (neighbourConfig == null)
+                    //{
+                    //    m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini");
+                    //    return;
+                    //}
+                    //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty);
+                    //if (serviceDll == String.Empty)
+                    //{
+                    //    m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService");
+                    //    return;
+                    //}
+
+                    m_Enabled = true;
+
+                    m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled");
+                }
+            }
+        }
+
+        public void PostInitialise()
+        {
+            //if (m_Enabled)
+            //{
+            //    Object[] args = new Object[] { m_Scenes };
+            //    m_LocalService =
+            //            ServerUtils.LoadPlugin<INeighbourService>(serviceDll,
+            //            args);
+
+            //    if (m_LocalService == null)
+            //    {
+            //        m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service");
+            //        Unregister();
+            //        return;
+            //    }
+            //}
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_MapService = scene.CommsManager.GridService;
+            m_LocalService.AddRegion(scene);
+            scene.RegisterModuleInterface<INeighbourService>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_Enabled && m_Scenes.Contains(scene))
+                m_LocalService.RemoveRegion(scene);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName);
+
+        }
+
+        #region INeighbourService
+
+        public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
+        {
+            if (m_LocalService.HelloNeighbour(regionHandle, thisRegion))
+                return true;
+
+            return base.HelloNeighbour(regionHandle, thisRegion);
+        }
+
+        #endregion INeighbourService
+    }
+}