diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs (renamed from OpenSim/SimulatorServices/SimulationService.cs) | 225 |
1 files changed, 113 insertions, 112 deletions
diff --git a/OpenSim/SimulatorServices/SimulationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs index 0aaacfd..4f92244 100644 --- a/OpenSim/SimulatorServices/SimulationService.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs | |||
@@ -1,112 +1,113 @@ | |||
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.Reflection; | 29 | using System.Reflection; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Servers.HttpServer; | 34 | using OpenSim.Framework.Servers.HttpServer; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Server.Base; | 37 | using OpenSim.Server.Base; |
38 | using OpenSim.Server.Handlers.Base; | 38 | using OpenSim.Server.Handlers.Base; |
39 | 39 | ||
40 | 40 | ||
41 | namespace OpenSim.SimulatorServices | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation |
42 | { | 42 | { |
43 | public class SimulationService : ISharedRegionModule | 43 | // Under construction |
44 | { | 44 | public class SimulationServiceInConnectorModule : ISharedRegionModule |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | { |
46 | private static bool m_Enabled = false; | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | private static bool m_Enabled = false; | |
48 | private IConfigSource m_Config; | 48 | |
49 | bool m_Registered = false; | 49 | private IConfigSource m_Config; |
50 | 50 | bool m_Registered = false; | |
51 | #region IRegionModule interface | 51 | |
52 | 52 | #region IRegionModule interface | |
53 | public void Initialise(IConfigSource config) | 53 | |
54 | { | 54 | public void Initialise(IConfigSource config) |
55 | m_Config = config; | 55 | { |
56 | 56 | m_Config = config; | |
57 | IConfig moduleConfig = config.Configs["Modules"]; | 57 | |
58 | if (moduleConfig != null) | 58 | IConfig moduleConfig = config.Configs["Modules"]; |
59 | { | 59 | if (moduleConfig != null) |
60 | string name = moduleConfig.GetString("SimulationService", ""); | 60 | { |
61 | if (name == Name) | 61 | string name = moduleConfig.GetString("SimulationService", ""); |
62 | { | 62 | if (name == Name) |
63 | m_Enabled = true; | 63 | { |
64 | m_log.Info("[SIM SERVICE]: SimulationService enabled"); | 64 | m_Enabled = true; |
65 | 65 | m_log.Info("[SIM SERVICE]: SimulationService enabled"); | |
66 | } | 66 | |
67 | } | 67 | } |
68 | 68 | } | |
69 | } | 69 | |
70 | 70 | } | |
71 | public void PostInitialise() | 71 | |
72 | { | 72 | public void PostInitialise() |
73 | } | 73 | { |
74 | 74 | } | |
75 | public void Close() | 75 | |
76 | { | 76 | public void Close() |
77 | } | 77 | { |
78 | 78 | } | |
79 | public string Name | 79 | |
80 | { | 80 | public string Name |
81 | get { return "SimulationService"; } | 81 | { |
82 | } | 82 | get { return "SimulationService"; } |
83 | 83 | } | |
84 | public void AddRegion(Scene scene) | 84 | |
85 | { | 85 | public void AddRegion(Scene scene) |
86 | if (!m_Enabled) | 86 | { |
87 | return; | 87 | if (!m_Enabled) |
88 | 88 | return; | |
89 | if (!m_Registered) | 89 | |
90 | { | 90 | if (!m_Registered) |
91 | m_Registered = true; | 91 | { |
92 | 92 | m_Registered = true; | |
93 | m_log.Info("[SIM SERVICE]: Starting..."); | 93 | |
94 | 94 | m_log.Info("[SIM SERVICE]: Starting..."); | |
95 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; | 95 | |
96 | 96 | Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; | |
97 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); | 97 | |
98 | } | 98 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); |
99 | } | 99 | } |
100 | 100 | } | |
101 | public void RemoveRegion(Scene scene) | 101 | |
102 | { | 102 | public void RemoveRegion(Scene scene) |
103 | } | 103 | { |
104 | 104 | } | |
105 | public void RegionLoaded(Scene scene) | 105 | |
106 | { | 106 | public void RegionLoaded(Scene scene) |
107 | } | 107 | { |
108 | 108 | } | |
109 | #endregion | 109 | |
110 | 110 | #endregion | |
111 | } | 111 | |
112 | } | 112 | } |
113 | } | ||