diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs) | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs index b12d778..c6848bb 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs | |||
@@ -36,11 +36,11 @@ 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 | using OpenSim.Server.Handlers.Grid; | 39 | using OpenSim.Server.Handlers.Hypergrid; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
42 | 42 | ||
43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid |
44 | { | 44 | { |
45 | public class HypergridServiceInConnectorModule : ISharedRegionModule | 45 | public class HypergridServiceInConnectorModule : ISharedRegionModule |
46 | { | 46 | { |
@@ -49,16 +49,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
49 | 49 | ||
50 | private IConfigSource m_Config; | 50 | private IConfigSource m_Config; |
51 | bool m_Registered = false; | 51 | bool m_Registered = false; |
52 | HypergridServiceInConnector m_HypergridHandler; | 52 | GatekeeperServiceInConnector m_HypergridHandler; |
53 | 53 | ||
54 | #region IRegionModule interface | 54 | #region IRegionModule interface |
55 | 55 | ||
56 | public void Initialise(IConfigSource config) | 56 | public void Initialise(IConfigSource config) |
57 | { | 57 | { |
58 | //// This module is only on for standalones in hypergrid mode | ||
59 | //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
60 | // config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
61 | //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
62 | m_Config = config; | 58 | m_Config = config; |
63 | IConfig moduleConfig = config.Configs["Modules"]; | 59 | IConfig moduleConfig = config.Configs["Modules"]; |
64 | if (moduleConfig != null) | 60 | if (moduleConfig != null) |
@@ -102,9 +98,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
102 | { | 98 | { |
103 | if (!m_Enabled) | 99 | if (!m_Enabled) |
104 | return; | 100 | return; |
105 | |||
106 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
107 | m_HypergridHandler.RemoveRegion(rinfo); | ||
108 | } | 101 | } |
109 | 102 | ||
110 | public void RegionLoaded(Scene scene) | 103 | public void RegionLoaded(Scene scene) |
@@ -118,14 +111,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
118 | 111 | ||
119 | m_log.Info("[HypergridService]: Starting..."); | 112 | m_log.Info("[HypergridService]: Starting..."); |
120 | 113 | ||
121 | // Object[] args = new Object[] { m_Config, MainServer.Instance }; | 114 | ISimulationService simService = scene.RequestModuleInterface<ISimulationService>(); |
115 | m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService); | ||
116 | scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper); | ||
122 | 117 | ||
123 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); | 118 | new UserAgentServerConnector(m_Config, MainServer.Instance); |
124 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | ||
125 | } | 119 | } |
126 | |||
127 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
128 | m_HypergridHandler.AddRegion(rinfo); | ||
129 | } | 120 | } |
130 | 121 | ||
131 | #endregion | 122 | #endregion |