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/Region/CoreModules/ServiceConnectorsOut/Land | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | 270 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs | 232 |
2 files changed, 251 insertions, 251 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs index a9d9663..73d12e5 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | |||
@@ -1,135 +1,135 @@ | |||
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 log4net; | 28 | using log4net; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using System; | 30 | using System; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Server.Base; | 34 | using OpenSim.Server.Base; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | 38 | ||
39 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | 39 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land |
40 | { | 40 | { |
41 | public class LocalLandServicesConnector : | 41 | public class LocalLandServicesConnector : |
42 | ISharedRegionModule, ILandService | 42 | ISharedRegionModule, ILandService |
43 | { | 43 | { |
44 | private static readonly ILog m_log = | 44 | private static readonly ILog m_log = |
45 | LogManager.GetLogger( | 45 | LogManager.GetLogger( |
46 | MethodBase.GetCurrentMethod().DeclaringType); | 46 | MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private List<Scene> m_Scenes = new List<Scene>(); | 48 | private List<Scene> m_Scenes = new List<Scene>(); |
49 | 49 | ||
50 | private bool m_Enabled = false; | 50 | private bool m_Enabled = false; |
51 | 51 | ||
52 | public LocalLandServicesConnector() | 52 | public LocalLandServicesConnector() |
53 | { | 53 | { |
54 | } | 54 | } |
55 | 55 | ||
56 | public LocalLandServicesConnector(List<Scene> scenes) | 56 | public LocalLandServicesConnector(List<Scene> scenes) |
57 | { | 57 | { |
58 | m_Scenes = scenes; | 58 | m_Scenes = scenes; |
59 | } | 59 | } |
60 | 60 | ||
61 | #region ISharedRegionModule | 61 | #region ISharedRegionModule |
62 | 62 | ||
63 | public string Name | 63 | public string Name |
64 | { | 64 | { |
65 | get { return "LocalLandServicesConnector"; } | 65 | get { return "LocalLandServicesConnector"; } |
66 | } | 66 | } |
67 | 67 | ||
68 | public void Initialise(IConfigSource source) | 68 | public void Initialise(IConfigSource source) |
69 | { | 69 | { |
70 | IConfig moduleConfig = source.Configs["Modules"]; | 70 | IConfig moduleConfig = source.Configs["Modules"]; |
71 | if (moduleConfig != null) | 71 | if (moduleConfig != null) |
72 | { | 72 | { |
73 | string name = moduleConfig.GetString("LandServices", this.Name); | 73 | string name = moduleConfig.GetString("LandServices", this.Name); |
74 | if (name == Name) | 74 | if (name == Name) |
75 | { | 75 | { |
76 | m_Enabled = true; | 76 | m_Enabled = true; |
77 | m_log.Info("[LAND CONNECTOR]: Local land connector enabled"); | 77 | m_log.Info("[LAND CONNECTOR]: Local land connector enabled"); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | public void Close() | 82 | public void Close() |
83 | { | 83 | { |
84 | } | 84 | } |
85 | 85 | ||
86 | public void AddRegion(Scene scene) | 86 | public void AddRegion(Scene scene) |
87 | { | 87 | { |
88 | m_Scenes.Add(scene); | 88 | m_Scenes.Add(scene); |
89 | 89 | ||
90 | if (!m_Enabled) | 90 | if (!m_Enabled) |
91 | return; | 91 | return; |
92 | 92 | ||
93 | scene.RegisterModuleInterface<ILandService>(this); | 93 | scene.RegisterModuleInterface<ILandService>(this); |
94 | } | 94 | } |
95 | 95 | ||
96 | public void RegionLoaded(Scene scene) | 96 | public void RegionLoaded(Scene scene) |
97 | { | 97 | { |
98 | } | 98 | } |
99 | 99 | ||
100 | public void PostInitialise() | 100 | public void PostInitialise() |
101 | { | 101 | { |
102 | } | 102 | } |
103 | 103 | ||
104 | public void RemoveRegion(Scene scene) | 104 | public void RemoveRegion(Scene scene) |
105 | { | 105 | { |
106 | if (m_Scenes.Contains(scene)) | 106 | if (m_Scenes.Contains(scene)) |
107 | m_Scenes.Remove(scene); | 107 | m_Scenes.Remove(scene); |
108 | } | 108 | } |
109 | 109 | ||
110 | #endregion ISharedRegionModule | 110 | #endregion ISharedRegionModule |
111 | 111 | ||
112 | #region ILandService | 112 | #region ILandService |
113 | 113 | ||
114 | public LandData GetLandData(ulong regionHandle, uint x, uint y) | 114 | public LandData GetLandData(ulong regionHandle, uint x, uint y) |
115 | { | 115 | { |
116 | m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}", | 116 | m_log.DebugFormat("[LAND CONNECTOR]: request for land data in {0} at {1}, {2}", |
117 | regionHandle, x, y); | 117 | regionHandle, x, y); |
118 | 118 | ||
119 | foreach (Scene s in m_Scenes) | 119 | foreach (Scene s in m_Scenes) |
120 | { | 120 | { |
121 | if (s.RegionInfo.RegionHandle == regionHandle) | 121 | if (s.RegionInfo.RegionHandle == regionHandle) |
122 | { | 122 | { |
123 | LandData land = s.GetLandData(x, y); | 123 | LandData land = s.GetLandData(x, y); |
124 | return land; | 124 | return land; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | m_log.Debug("[LAND CONNECTOR]: didn't find land data locally."); | 128 | m_log.Debug("[LAND CONNECTOR]: didn't find land data locally."); |
129 | return null; | 129 | return null; |
130 | 130 | ||
131 | } | 131 | } |
132 | 132 | ||
133 | #endregion ILandService | 133 | #endregion ILandService |
134 | } | 134 | } |
135 | } | 135 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs index f64a1ce..27f811c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs | |||
@@ -1,116 +1,116 @@ | |||
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 log4net; | 28 | using log4net; |
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Services.Connectors; | 34 | using OpenSim.Services.Connectors; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using OpenSim.Server.Base; | 38 | using OpenSim.Server.Base; |
39 | 39 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | 40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land |
41 | { | 41 | { |
42 | public class RemoteLandServicesConnector : | 42 | public class RemoteLandServicesConnector : |
43 | LandServicesConnector, ISharedRegionModule, ILandService | 43 | LandServicesConnector, ISharedRegionModule, ILandService |
44 | { | 44 | { |
45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
46 | LogManager.GetLogger( | 46 | LogManager.GetLogger( |
47 | MethodBase.GetCurrentMethod().DeclaringType); | 47 | MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private bool m_Enabled = false; | 49 | private bool m_Enabled = false; |
50 | private LocalLandServicesConnector m_LocalService; | 50 | private LocalLandServicesConnector m_LocalService; |
51 | 51 | ||
52 | public string Name | 52 | public string Name |
53 | { | 53 | { |
54 | get { return "RemoteLandServicesConnector"; } | 54 | get { return "RemoteLandServicesConnector"; } |
55 | } | 55 | } |
56 | 56 | ||
57 | public void Initialise(IConfigSource source) | 57 | public void Initialise(IConfigSource source) |
58 | { | 58 | { |
59 | IConfig moduleConfig = source.Configs["Modules"]; | 59 | IConfig moduleConfig = source.Configs["Modules"]; |
60 | if (moduleConfig != null) | 60 | if (moduleConfig != null) |
61 | { | 61 | { |
62 | string name = moduleConfig.GetString("LandServices", ""); | 62 | string name = moduleConfig.GetString("LandServices", ""); |
63 | if (name == Name) | 63 | if (name == Name) |
64 | { | 64 | { |
65 | m_LocalService = new LocalLandServicesConnector(); | 65 | m_LocalService = new LocalLandServicesConnector(); |
66 | 66 | ||
67 | m_Enabled = true; | 67 | m_Enabled = true; |
68 | 68 | ||
69 | m_log.Info("[LAND CONNECTOR]: Remote Land connector enabled"); | 69 | m_log.Info("[LAND CONNECTOR]: Remote Land connector enabled"); |
70 | } | 70 | } |
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
74 | public void PostInitialise() | 74 | public void PostInitialise() |
75 | { | 75 | { |
76 | } | 76 | } |
77 | 77 | ||
78 | public void Close() | 78 | public void Close() |
79 | { | 79 | { |
80 | } | 80 | } |
81 | 81 | ||
82 | public void AddRegion(Scene scene) | 82 | public void AddRegion(Scene scene) |
83 | { | 83 | { |
84 | if (!m_Enabled) | 84 | if (!m_Enabled) |
85 | return; | 85 | return; |
86 | 86 | ||
87 | m_MapService = scene.CommsManager.GridService; | 87 | m_MapService = scene.CommsManager.GridService; |
88 | m_LocalService.AddRegion(scene); | 88 | m_LocalService.AddRegion(scene); |
89 | scene.RegisterModuleInterface<ILandService>(this); | 89 | scene.RegisterModuleInterface<ILandService>(this); |
90 | } | 90 | } |
91 | 91 | ||
92 | public void RemoveRegion(Scene scene) | 92 | public void RemoveRegion(Scene scene) |
93 | { | 93 | { |
94 | if (m_Enabled) | 94 | if (m_Enabled) |
95 | m_LocalService.RemoveRegion(scene); | 95 | m_LocalService.RemoveRegion(scene); |
96 | } | 96 | } |
97 | 97 | ||
98 | public void RegionLoaded(Scene scene) | 98 | public void RegionLoaded(Scene scene) |
99 | { | 99 | { |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | #region ILandService | 103 | #region ILandService |
104 | 104 | ||
105 | public override LandData GetLandData(ulong regionHandle, uint x, uint y) | 105 | public override LandData GetLandData(ulong regionHandle, uint x, uint y) |
106 | { | 106 | { |
107 | LandData land = m_LocalService.GetLandData(regionHandle, x, y); | 107 | LandData land = m_LocalService.GetLandData(regionHandle, x, y); |
108 | if (land != null) | 108 | if (land != null) |
109 | return land; | 109 | return land; |
110 | 110 | ||
111 | return base.GetLandData(regionHandle, x, y); | 111 | return base.GetLandData(regionHandle, x, y); |
112 | 112 | ||
113 | } | 113 | } |
114 | #endregion ILandService | 114 | #endregion ILandService |
115 | } | 115 | } |
116 | } | 116 | } |