1 files changed, 68 insertions, 68 deletions
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
index a708b37..b3a91cf 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -1,68 +1,68 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
+using OpenSim.Services.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Server.Handlers.Base;
+using OpenSim.Server.Handlers.Base;
-namespace OpenSim.Server.Handlers.Neighbour
+namespace OpenSim.Server.Handlers.Neighbour
-{
+{
-    public class NeighbourServiceInConnector : ServiceConnector
+    public class NeighbourServiceInConnector : ServiceConnector
-    {
+    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private INeighbourService m_NeighbourService;
+        private INeighbourService m_NeighbourService;
-        private IAuthenticationService m_AuthenticationService = null;
+        private IAuthenticationService m_AuthenticationService = null;
-        public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
+        public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
-                base(source, server)
+                base(source, server)
-        {
+        {
-            m_NeighbourService = nService;
+            m_NeighbourService = nService;
-            if (m_NeighbourService == null)
+            if (m_NeighbourService == null)
-            {
+            {
-                m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
+                m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
-                return;
+                return;
-            }
+            }
-            
+            
-            //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
+            //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
-            //if (authentication)
+            //if (authentication)
-            //    m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
+            //    m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
-            server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));
+            server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));
-            server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));
+            server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs index a708b37..b3a91cf 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourServiceInConnector.cs
@@ -1,68 +1,68 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using System.Reflection;	30	using System.Reflection;
31	using log4net;	31	using log4net;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Server.Base;	33	using OpenSim.Server.Base;
34	using OpenSim.Services.Interfaces;	34	using OpenSim.Services.Interfaces;
35	using OpenSim.Framework;	35	using OpenSim.Framework;
36	using OpenSim.Framework.Servers.HttpServer;	36	using OpenSim.Framework.Servers.HttpServer;
37	using OpenSim.Server.Handlers.Base;	37	using OpenSim.Server.Handlers.Base;
38		38
39	namespace OpenSim.Server.Handlers.Neighbour	39	namespace OpenSim.Server.Handlers.Neighbour
40	{	40	{
41	public class NeighbourServiceInConnector : ServiceConnector	41	public class NeighbourServiceInConnector : ServiceConnector
42	{	42	{
43	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	43	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44		44
45	private INeighbourService m_NeighbourService;	45	private INeighbourService m_NeighbourService;
46	private IAuthenticationService m_AuthenticationService = null;	46	private IAuthenticationService m_AuthenticationService = null;
47		47
48	public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :	48	public NeighbourServiceInConnector(IConfigSource source, IHttpServer server, INeighbourService nService, IScene scene) :
49	base(source, server)	49	base(source, server)
50	{	50	{
51		51
52	m_NeighbourService = nService;	52	m_NeighbourService = nService;
53	if (m_NeighbourService == null)	53	if (m_NeighbourService == null)
54	{	54	{
55	m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");	55	m_log.Error("[NEIGHBOUR IN CONNECTOR]: neighbour service was not provided");
56	return;	56	return;
57	}	57	}
58		58
59	//bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);	59	//bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false);
60	//if (authentication)	60	//if (authentication)
61	// m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();	61	// m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>();
62		62
63		63
64	server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));	64	server.AddStreamHandler(new NeighbourPostHandler(m_NeighbourService, m_AuthenticationService));
65	server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));	65	server.AddStreamHandler(new NeighbourGetHandler(m_NeighbourService, m_AuthenticationService));
66	}	66	}
67	}	67	}
68	}	68	}