diff options
Diffstat (limited to '')
5 files changed, 257 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index f82a6a1..a526bb2 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -94,7 +94,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
94 | // httpServer.AddXmlRPCHandler("expect_user", ExpectUser); | 94 | // httpServer.AddXmlRPCHandler("expect_user", ExpectUser); |
95 | // httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); | 95 | // httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); |
96 | httpServer.AddXmlRPCHandler("check", PingCheckReply); | 96 | httpServer.AddXmlRPCHandler("check", PingCheckReply); |
97 | httpServer.AddXmlRPCHandler("land_data", LandData); | 97 | |
98 | // Retired into the new service connectors, 6/14/09 | ||
99 | //httpServer.AddXmlRPCHandler("land_data", LandData); | ||
98 | 100 | ||
99 | } | 101 | } |
100 | 102 | ||
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index d779f29..1c79bf4 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -28,6 +28,8 @@ | |||
28 | <RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" /> | 28 | <RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" /> |
29 | <RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" /> | 29 | <RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" /> |
30 | <RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" /> | 30 | <RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" /> |
31 | <RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" /> | ||
32 | <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" /> | ||
31 | </Extension> | 33 | </Extension> |
32 | 34 | ||
33 | <Extension path = "/OpenSim/WindModule"> | 35 | <Extension path = "/OpenSim/WindModule"> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs new file mode 100644 index 0000000..a9d9663 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | |||
@@ -0,0 +1,135 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using log4net; | ||
29 | using Nini.Config; | ||
30 | using System; | ||
31 | using System.Collections.Generic; | ||
32 | using System.Reflection; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Server.Base; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | |||
39 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | ||
40 | { | ||
41 | public class LocalLandServicesConnector : | ||
42 | ISharedRegionModule, ILandService | ||
43 | { | ||
44 | private static readonly ILog m_log = | ||
45 | LogManager.GetLogger( | ||
46 | MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | |||
48 | private List<Scene> m_Scenes = new List<Scene>(); | ||
49 | |||
50 | private bool m_Enabled = false; | ||
51 | |||
52 | public LocalLandServicesConnector() | ||
53 | { | ||
54 | } | ||
55 | |||
56 | public LocalLandServicesConnector(List<Scene> scenes) | ||
57 | { | ||
58 | m_Scenes = scenes; | ||
59 | } | ||
60 | |||
61 | #region ISharedRegionModule | ||
62 | |||
63 | public string Name | ||
64 | { | ||
65 | get { return "LocalLandServicesConnector"; } | ||
66 | } | ||
67 | |||
68 | public void Initialise(IConfigSource source) | ||
69 | { | ||
70 | IConfig moduleConfig = source.Configs["Modules"]; | ||
71 | if (moduleConfig != null) | ||
72 | { | ||
73 | string name = moduleConfig.GetString("LandServices", this.Name); | ||
74 | if (name == Name) | ||
75 | { | ||
76 | m_Enabled = true; | ||
77 | m_log.Info("[LAND CONNECTOR]: Local land connector enabled"); | ||
78 | } | ||
79 | } | ||
80 | } | ||
81 | |||
82 | public void Close() | ||
83 | { | ||
84 | } | ||
85 | |||
86 | public void AddRegion(Scene scene) | ||
87 | { | ||
88 | m_Scenes.Add(scene); | ||
89 | |||
90 | if (!m_Enabled) | ||
91 | return; | ||
92 | |||
93 | scene.RegisterModuleInterface<ILandService>(this); | ||
94 | } | ||
95 | |||
96 | public void RegionLoaded(Scene scene) | ||
97 | { | ||
98 | } | ||
99 | |||
100 | public void PostInitialise() | ||
101 | { | ||
102 | } | ||
103 | |||
104 | public void RemoveRegion(Scene scene) | ||
105 | { | ||
106 | if (m_Scenes.Contains(scene)) | ||
107 | m_Scenes.Remove(scene); | ||
108 | } | ||
109 | |||
110 | #endregion ISharedRegionModule | ||
111 | |||
112 | #region ILandService | ||
113 | |||
114 | public LandData GetLandData(ulong regionHandle, uint x, uint y) | ||
115 | { | ||
116 | m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}", | ||
117 | regionHandle, x, y); | ||
118 | |||
119 | foreach (Scene s in m_Scenes) | ||
120 | { | ||
121 | if (s.RegionInfo.RegionHandle == regionHandle) | ||
122 | { | ||
123 | LandData land = s.GetLandData(x, y); | ||
124 | return land; | ||
125 | } | ||
126 | } | ||
127 | |||
128 | m_log.Debug("[LAND CONNECTOR]: didn't find land data locally."); | ||
129 | return null; | ||
130 | |||
131 | } | ||
132 | |||
133 | #endregion ILandService | ||
134 | } | ||
135 | } | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs new file mode 100644 index 0000000..f64a1ce --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs | |||
@@ -0,0 +1,116 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using log4net; | ||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Services.Connectors; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | using OpenSim.Server.Base; | ||
39 | |||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | ||
41 | { | ||
42 | public class RemoteLandServicesConnector : | ||
43 | LandServicesConnector, ISharedRegionModule, ILandService | ||
44 | { | ||
45 | private static readonly ILog m_log = | ||
46 | LogManager.GetLogger( | ||
47 | MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
49 | private bool m_Enabled = false; | ||
50 | private LocalLandServicesConnector m_LocalService; | ||
51 | |||
52 | public string Name | ||
53 | { | ||
54 | get { return "RemoteLandServicesConnector"; } | ||
55 | } | ||
56 | |||
57 | public void Initialise(IConfigSource source) | ||
58 | { | ||
59 | IConfig moduleConfig = source.Configs["Modules"]; | ||
60 | if (moduleConfig != null) | ||
61 | { | ||
62 | string name = moduleConfig.GetString("LandServices", ""); | ||
63 | if (name == Name) | ||
64 | { | ||
65 | m_LocalService = new LocalLandServicesConnector(); | ||
66 | |||
67 | m_Enabled = true; | ||
68 | |||
69 | m_log.Info("[LAND CONNECTOR]: Remote Land connector enabled"); | ||
70 | } | ||
71 | } | ||
72 | } | ||
73 | |||
74 | public void PostInitialise() | ||
75 | { | ||
76 | } | ||
77 | |||
78 | public void Close() | ||
79 | { | ||
80 | } | ||
81 | |||
82 | public void AddRegion(Scene scene) | ||
83 | { | ||
84 | if (!m_Enabled) | ||
85 | return; | ||
86 | |||
87 | m_MapService = scene.CommsManager.GridService; | ||
88 | m_LocalService.AddRegion(scene); | ||
89 | scene.RegisterModuleInterface<ILandService>(this); | ||
90 | } | ||
91 | |||
92 | public void RemoveRegion(Scene scene) | ||
93 | { | ||
94 | if (m_Enabled) | ||
95 | m_LocalService.RemoveRegion(scene); | ||
96 | } | ||
97 | |||
98 | public void RegionLoaded(Scene scene) | ||
99 | { | ||
100 | } | ||
101 | |||
102 | |||
103 | #region ILandService | ||
104 | |||
105 | public override LandData GetLandData(ulong regionHandle, uint x, uint y) | ||
106 | { | ||
107 | LandData land = m_LocalService.GetLandData(regionHandle, x, y); | ||
108 | if (land != null) | ||
109 | return land; | ||
110 | |||
111 | return base.GetLandData(regionHandle, x, y); | ||
112 | |||
113 | } | ||
114 | #endregion ILandService | ||
115 | } | ||
116 | } | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index d584a98..dc876e3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
120 | 120 | ||
121 | public void RemoveRegion(Scene scene) | 121 | public void RemoveRegion(Scene scene) |
122 | { | 122 | { |
123 | if (m_Enabled && m_Scenes.Contains(scene)) | 123 | if (m_Enabled) |
124 | m_LocalService.RemoveRegion(scene); | 124 | m_LocalService.RemoveRegion(scene); |
125 | } | 125 | } |
126 | 126 | ||