aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsIn
diff options
context:
space:
mode:
authorDiva Canto2010-01-16 21:42:44 -0800
committerDiva Canto2010-01-16 21:42:44 -0800
commit04e29c1bacbc1e2df980ae15896a847ce7535da2 (patch)
treee799d2837af1a41bc2c3b2d571201e9a8a6d7ae7 /OpenSim/Region/CoreModules/ServiceConnectorsIn
parentFinished moving object crossings into EntityTransferModule (diff)
downloadopensim-SC_OLD-04e29c1bacbc1e2df980ae15896a847ce7535da2.zip
opensim-SC_OLD-04e29c1bacbc1e2df980ae15896a847ce7535da2.tar.gz
opensim-SC_OLD-04e29c1bacbc1e2df980ae15896a847ce7535da2.tar.bz2
opensim-SC_OLD-04e29c1bacbc1e2df980ae15896a847ce7535da2.tar.xz
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
index b12d778..6ec0fcf 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base; 38using OpenSim.Server.Handlers.Base;
39using OpenSim.Server.Handlers.Grid; 39using OpenSim.Server.Handlers.Hypergrid;
40using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
41using GridRegion = OpenSim.Services.Interfaces.GridRegion; 41using GridRegion = OpenSim.Services.Interfaces.GridRegion;
42 42
@@ -49,7 +49,7 @@ 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
@@ -102,9 +102,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
102 { 102 {
103 if (!m_Enabled) 103 if (!m_Enabled)
104 return; 104 return;
105
106 GridRegion rinfo = new GridRegion(scene.RegionInfo);
107 m_HypergridHandler.RemoveRegion(rinfo);
108 } 105 }
109 106
110 public void RegionLoaded(Scene scene) 107 public void RegionLoaded(Scene scene)
@@ -119,13 +116,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
119 m_log.Info("[HypergridService]: Starting..."); 116 m_log.Info("[HypergridService]: Starting...");
120 117
121// Object[] args = new Object[] { m_Config, MainServer.Instance }; 118// Object[] args = new Object[] { m_Config, MainServer.Instance };
122 119 ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
123 m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); 120 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
124 //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); 121 //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args);
125 } 122 }
126
127 GridRegion rinfo = new GridRegion(scene.RegionInfo);
128 m_HypergridHandler.AddRegion(rinfo);
129 } 123 }
130 124
131 #endregion 125 #endregion