diff options
author | diva | 2009-06-15 00:17:17 +0000 |
---|---|---|
committer | diva | 2009-06-15 00:17:17 +0000 |
commit | 54d44e370b1c6995a887e17823c9de645d1e72bb (patch) | |
tree | 5b470056344f5f831bdefbb483e3ef5f14790433 /OpenSim/SimulatorServices | |
parent | Factoring out "land_data" / RequestLandData that was hanging off of IGridServ... (diff) | |
download | opensim-SC-54d44e370b1c6995a887e17823c9de645d1e72bb.zip opensim-SC-54d44e370b1c6995a887e17823c9de645d1e72bb.tar.gz opensim-SC-54d44e370b1c6995a887e17823c9de645d1e72bb.tar.bz2 opensim-SC-54d44e370b1c6995a887e17823c9de645d1e72bb.tar.xz |
Removing the OpenSim.SimulatorServices project. All of those region modules are now in CoreModules/ServiceConnectorsIn, where they belong.
Diffstat (limited to 'OpenSim/SimulatorServices')
-rw-r--r-- | OpenSim/SimulatorServices/LandServiceInConnectorModule.cs | 137 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs | 137 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/RegionAssetService.cs | 103 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/RegionInventoryService.cs | 102 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml | 17 | ||||
-rw-r--r-- | OpenSim/SimulatorServices/SimulationService.cs | 112 |
6 files changed, 0 insertions, 608 deletions
diff --git a/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs b/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs deleted file mode 100644 index 58d276d..0000000 --- a/OpenSim/SimulatorServices/LandServiceInConnectorModule.cs +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
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 System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers.HttpServer; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | using OpenSim.Services.Interfaces; | ||
40 | |||
41 | |||
42 | namespace OpenSim.SimulatorServices | ||
43 | { | ||
44 | public class LandServiceInConnectorModule : ISharedRegionModule, ILandService | ||
45 | { | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | private static bool m_Enabled = false; | ||
48 | private static bool m_Registered = false; | ||
49 | |||
50 | private IConfigSource m_Config; | ||
51 | private List<Scene> m_Scenes = new List<Scene>(); | ||
52 | |||
53 | #region IRegionModule interface | ||
54 | |||
55 | public void Initialise(IConfigSource config) | ||
56 | { | ||
57 | m_Config = config; | ||
58 | |||
59 | IConfig moduleConfig = config.Configs["Modules"]; | ||
60 | if (moduleConfig != null) | ||
61 | { | ||
62 | m_Enabled = moduleConfig.GetBoolean("LandServiceInConnector", false); | ||
63 | if (m_Enabled) | ||
64 | { | ||
65 | m_log.Info("[LAND IN CONNECTOR]: LandServiceInConnector enabled"); | ||
66 | } | ||
67 | |||
68 | } | ||
69 | |||
70 | } | ||
71 | |||
72 | public void PostInitialise() | ||
73 | { | ||
74 | if (!m_Enabled) | ||
75 | return; | ||
76 | |||
77 | m_log.Info("[LAND IN CONNECTOR]: Starting..."); | ||
78 | } | ||
79 | |||
80 | public void Close() | ||
81 | { | ||
82 | } | ||
83 | |||
84 | public string Name | ||
85 | { | ||
86 | get { return "LandServiceInConnectorModule"; } | ||
87 | } | ||
88 | |||
89 | public void AddRegion(Scene scene) | ||
90 | { | ||
91 | if (!m_Enabled) | ||
92 | return; | ||
93 | |||
94 | if (!m_Registered) | ||
95 | { | ||
96 | m_Registered = true; | ||
97 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; | ||
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args); | ||
99 | } | ||
100 | |||
101 | m_Scenes.Add(scene); | ||
102 | |||
103 | } | ||
104 | |||
105 | public void RemoveRegion(Scene scene) | ||
106 | { | ||
107 | if (m_Enabled && m_Scenes.Contains(scene)) | ||
108 | m_Scenes.Remove(scene); | ||
109 | } | ||
110 | |||
111 | public void RegionLoaded(Scene scene) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | #endregion | ||
116 | |||
117 | #region ILandService | ||
118 | |||
119 | public LandData GetLandData(ulong regionHandle, uint x, uint y) | ||
120 | { | ||
121 | m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {2}", | ||
122 | regionHandle, m_Scenes.Count); | ||
123 | foreach (Scene s in m_Scenes) | ||
124 | { | ||
125 | if (s.RegionInfo.RegionHandle == regionHandle) | ||
126 | { | ||
127 | m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from"); | ||
128 | return s.GetLandData(x, y); | ||
129 | } | ||
130 | } | ||
131 | m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); | ||
132 | return null; | ||
133 | } | ||
134 | |||
135 | #endregion ILandService | ||
136 | } | ||
137 | } | ||
diff --git a/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs b/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs deleted file mode 100644 index 8da2e45..0000000 --- a/OpenSim/SimulatorServices/NeighbourServiceInConnectorModule.cs +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
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 System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers.HttpServer; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | using OpenSim.Services.Interfaces; | ||
40 | |||
41 | |||
42 | namespace OpenSim.SimulatorServices | ||
43 | { | ||
44 | public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService | ||
45 | { | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | private static bool m_Enabled = false; | ||
48 | private static bool m_Registered = false; | ||
49 | |||
50 | private IConfigSource m_Config; | ||
51 | private List<Scene> m_Scenes = new List<Scene>(); | ||
52 | |||
53 | #region IRegionModule interface | ||
54 | |||
55 | public void Initialise(IConfigSource config) | ||
56 | { | ||
57 | m_Config = config; | ||
58 | |||
59 | IConfig moduleConfig = config.Configs["Modules"]; | ||
60 | if (moduleConfig != null) | ||
61 | { | ||
62 | m_Enabled = moduleConfig.GetBoolean("NeighbourServiceInConnector", false); | ||
63 | if (m_Enabled) | ||
64 | { | ||
65 | m_log.Info("[NEIGHBOUR IN CONNECTOR]: NeighbourServiceInConnector enabled"); | ||
66 | } | ||
67 | |||
68 | } | ||
69 | |||
70 | } | ||
71 | |||
72 | public void PostInitialise() | ||
73 | { | ||
74 | if (!m_Enabled) | ||
75 | return; | ||
76 | |||
77 | m_log.Info("[NEIGHBOUR IN CONNECTOR]: Starting..."); | ||
78 | } | ||
79 | |||
80 | public void Close() | ||
81 | { | ||
82 | } | ||
83 | |||
84 | public string Name | ||
85 | { | ||
86 | get { return "NeighbourServiceInConnectorModule"; } | ||
87 | } | ||
88 | |||
89 | public void AddRegion(Scene scene) | ||
90 | { | ||
91 | if (!m_Enabled) | ||
92 | return; | ||
93 | |||
94 | if (!m_Registered) | ||
95 | { | ||
96 | m_Registered = true; | ||
97 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; | ||
98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args); | ||
99 | } | ||
100 | |||
101 | m_Scenes.Add(scene); | ||
102 | |||
103 | } | ||
104 | |||
105 | public void RemoveRegion(Scene scene) | ||
106 | { | ||
107 | if (m_Enabled && m_Scenes.Contains(scene)) | ||
108 | m_Scenes.Remove(scene); | ||
109 | } | ||
110 | |||
111 | public void RegionLoaded(Scene scene) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | #endregion | ||
116 | |||
117 | #region INeighbourService | ||
118 | |||
119 | public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | ||
120 | { | ||
121 | m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", | ||
122 | thisRegion.RegionName, regionHandle, m_Scenes.Count); | ||
123 | foreach (Scene s in m_Scenes) | ||
124 | { | ||
125 | if (s.RegionInfo.RegionHandle == regionHandle) | ||
126 | { | ||
127 | m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour"); | ||
128 | return s.IncomingHelloNeighbour(thisRegion); | ||
129 | } | ||
130 | } | ||
131 | m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle); | ||
132 | return false; | ||
133 | } | ||
134 | |||
135 | #endregion INeighbourService | ||
136 | } | ||
137 | } | ||
diff --git a/OpenSim/SimulatorServices/RegionAssetService.cs b/OpenSim/SimulatorServices/RegionAssetService.cs deleted file mode 100644 index b8e1adc..0000000 --- a/OpenSim/SimulatorServices/RegionAssetService.cs +++ /dev/null | |||
@@ -1,103 +0,0 @@ | |||
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 System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers.HttpServer; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | |||
40 | namespace OpenSim.SimulatorServices | ||
41 | { | ||
42 | public class RegionAssetService : ISharedRegionModule | ||
43 | { | ||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | private static bool enabled = false; | ||
46 | |||
47 | private IConfigSource m_Config; | ||
48 | bool m_Registered = false; | ||
49 | |||
50 | #region IRegionModule interface | ||
51 | |||
52 | public void Initialise(IConfigSource config) | ||
53 | { | ||
54 | // This module is only on for standalones in hypergrid mode | ||
55 | enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
56 | config.Configs["Startup"].GetBoolean("hypergrid", true)) || | ||
57 | ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); | ||
58 | m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled); | ||
59 | m_Config = config; | ||
60 | } | ||
61 | |||
62 | public void PostInitialise() | ||
63 | { | ||
64 | } | ||
65 | |||
66 | public void Close() | ||
67 | { | ||
68 | } | ||
69 | |||
70 | public string Name | ||
71 | { | ||
72 | get { return "RegionAssetService"; } | ||
73 | } | ||
74 | |||
75 | public void AddRegion(Scene scene) | ||
76 | { | ||
77 | if (!enabled) | ||
78 | return; | ||
79 | |||
80 | if (!m_Registered) | ||
81 | { | ||
82 | m_Registered = true; | ||
83 | |||
84 | m_log.Info("[RegionAssetService]: Starting..."); | ||
85 | |||
86 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; | ||
87 | |||
88 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); | ||
89 | } | ||
90 | } | ||
91 | |||
92 | public void RemoveRegion(Scene scene) | ||
93 | { | ||
94 | } | ||
95 | |||
96 | public void RegionLoaded(Scene scene) | ||
97 | { | ||
98 | } | ||
99 | |||
100 | #endregion | ||
101 | |||
102 | } | ||
103 | } | ||
diff --git a/OpenSim/SimulatorServices/RegionInventoryService.cs b/OpenSim/SimulatorServices/RegionInventoryService.cs deleted file mode 100644 index d95058e..0000000 --- a/OpenSim/SimulatorServices/RegionInventoryService.cs +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
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 System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers.HttpServer; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | |||
40 | namespace OpenSim.SimulatorServices | ||
41 | { | ||
42 | public class RegionInventoryService : ISharedRegionModule | ||
43 | { | ||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | private static bool enabled = false; | ||
46 | |||
47 | private IConfigSource m_Config; | ||
48 | bool m_Registered = false; | ||
49 | |||
50 | #region IRegionModule interface | ||
51 | |||
52 | public void Initialise(IConfigSource config) | ||
53 | { | ||
54 | // This module is only on for standalones in hypergrid mode | ||
55 | enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
56 | config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
57 | m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
58 | m_Config = config; | ||
59 | } | ||
60 | |||
61 | public void PostInitialise() | ||
62 | { | ||
63 | } | ||
64 | |||
65 | public void Close() | ||
66 | { | ||
67 | } | ||
68 | |||
69 | public string Name | ||
70 | { | ||
71 | get { return "RegionInventoryService"; } | ||
72 | } | ||
73 | |||
74 | public void AddRegion(Scene scene) | ||
75 | { | ||
76 | if (!enabled) | ||
77 | return; | ||
78 | |||
79 | if (!m_Registered) | ||
80 | { | ||
81 | m_Registered = true; | ||
82 | |||
83 | m_log.Info("[RegionInventoryService]: Starting..."); | ||
84 | |||
85 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; | ||
86 | |||
87 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); | ||
88 | } | ||
89 | } | ||
90 | |||
91 | public void RemoveRegion(Scene scene) | ||
92 | { | ||
93 | } | ||
94 | |||
95 | public void RegionLoaded(Scene scene) | ||
96 | { | ||
97 | } | ||
98 | |||
99 | #endregion | ||
100 | |||
101 | } | ||
102 | } | ||
diff --git a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml b/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml deleted file mode 100644 index 18b9423..0000000 --- a/OpenSim/SimulatorServices/Resources/SimulatorServices.addin.xml +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | <Addin id="OpenSim.SimulatorServices" version="0.2"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.SimulatorServices.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.5" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/RegionModules"> | ||
11 | <RegionModule id="RegionAssetService" type="OpenSim.SimulatorServices.RegionAssetService" /> | ||
12 | <RegionModule id="RegionInventoryService" type="OpenSim.SimulatorServices.RegionInventoryService" /> | ||
13 | <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.SimulatorServices.NeighbourServiceInConnectorModule" /> | ||
14 | <RegionModule id="LandServiceInConnectorModule" type="OpenSim.SimulatorServices.LandServiceInConnectorModule" /> | ||
15 | </Extension> | ||
16 | |||
17 | </Addin> | ||
diff --git a/OpenSim/SimulatorServices/SimulationService.cs b/OpenSim/SimulatorServices/SimulationService.cs deleted file mode 100644 index 0aaacfd..0000000 --- a/OpenSim/SimulatorServices/SimulationService.cs +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
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 System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers.HttpServer; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | |||
40 | |||
41 | namespace OpenSim.SimulatorServices | ||
42 | { | ||
43 | public class SimulationService : ISharedRegionModule | ||
44 | { | ||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | private static bool m_Enabled = false; | ||
47 | |||
48 | private IConfigSource m_Config; | ||
49 | bool m_Registered = false; | ||
50 | |||
51 | #region IRegionModule interface | ||
52 | |||
53 | public void Initialise(IConfigSource config) | ||
54 | { | ||
55 | m_Config = config; | ||
56 | |||
57 | IConfig moduleConfig = config.Configs["Modules"]; | ||
58 | if (moduleConfig != null) | ||
59 | { | ||
60 | string name = moduleConfig.GetString("SimulationService", ""); | ||
61 | if (name == Name) | ||
62 | { | ||
63 | m_Enabled = true; | ||
64 | m_log.Info("[SIM SERVICE]: SimulationService enabled"); | ||
65 | |||
66 | } | ||
67 | } | ||
68 | |||
69 | } | ||
70 | |||
71 | public void PostInitialise() | ||
72 | { | ||
73 | } | ||
74 | |||
75 | public void Close() | ||
76 | { | ||
77 | } | ||
78 | |||
79 | public string Name | ||
80 | { | ||
81 | get { return "SimulationService"; } | ||
82 | } | ||
83 | |||
84 | public void AddRegion(Scene scene) | ||
85 | { | ||
86 | if (!m_Enabled) | ||
87 | return; | ||
88 | |||
89 | if (!m_Registered) | ||
90 | { | ||
91 | m_Registered = true; | ||
92 | |||
93 | m_log.Info("[SIM SERVICE]: Starting..."); | ||
94 | |||
95 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; | ||
96 | |||
97 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); | ||
98 | } | ||
99 | } | ||
100 | |||
101 | public void RemoveRegion(Scene scene) | ||
102 | { | ||
103 | } | ||
104 | |||
105 | public void RegionLoaded(Scene scene) | ||
106 | { | ||
107 | } | ||
108 | |||
109 | #endregion | ||
110 | |||
111 | } | ||
112 | } | ||