diff options
author | Jeff Ames | 2009-06-22 10:07:27 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-22 10:07:27 +0000 |
commit | 142b481e032f7b8206a19e78af82847370b8bf9c (patch) | |
tree | 56fdf67bdc78d29214e2ea4742ffb7abcd36d212 /OpenSim/Server/Handlers/Land/LandServiceInConnector.cs | |
parent | * Panda no like LongRunningAttribute, no? Me now reverting minuscule fix, yes... (diff) | |
download | opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.zip opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.gz opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.bz2 opensim-SC_OLD-142b481e032f7b8206a19e78af82847370b8bf9c.tar.xz |
Update svn properties.
Diffstat (limited to 'OpenSim/Server/Handlers/Land/LandServiceInConnector.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Land/LandServiceInConnector.cs | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs index f550b10..10e3b47 100644 --- a/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs +++ b/OpenSim/Server/Handlers/Land/LandServiceInConnector.cs | |||
@@ -1,66 +1,66 @@ | |||
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.Land | 39 | namespace OpenSim.Server.Handlers.Land |
40 | { | 40 | { |
41 | public class LandServiceInConnector : ServiceConnector | 41 | public class LandServiceInConnector : 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 ILandService m_LandService; | 45 | private ILandService m_LandService; |
46 | // TODO : private IAuthenticationService m_AuthenticationService; | 46 | // TODO : private IAuthenticationService m_AuthenticationService; |
47 | 47 | ||
48 | public LandServiceInConnector(IConfigSource source, IHttpServer server, ILandService service, IScene scene) : | 48 | public LandServiceInConnector(IConfigSource source, IHttpServer server, ILandService service, IScene scene) : |
49 | base(source, server) | 49 | base(source, server) |
50 | { | 50 | { |
51 | m_LandService = service; | 51 | m_LandService = service; |
52 | if (m_LandService == null) | 52 | if (m_LandService == null) |
53 | { | 53 | { |
54 | m_log.Error("[LAND IN CONNECTOR]: Land service was not provided"); | 54 | m_log.Error("[LAND IN CONNECTOR]: Land service was not provided"); |
55 | return; | 55 | return; |
56 | } | 56 | } |
57 | 57 | ||
58 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); | 58 | //bool authentication = neighbourConfig.GetBoolean("RequireAuthentication", false); |
59 | //if (authentication) | 59 | //if (authentication) |
60 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); | 60 | // m_AuthenticationService = scene.RequestModuleInterface<IAuthenticationService>(); |
61 | 61 | ||
62 | LandHandlers landHandlers = new LandHandlers(m_LandService); | 62 | LandHandlers landHandlers = new LandHandlers(m_LandService); |
63 | server.AddXmlRPCHandler("land_data", landHandlers.GetLandData, false); | 63 | server.AddXmlRPCHandler("land_data", landHandlers.GetLandData, false); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | } | 66 | } |