diff options
author | Diva Canto | 2009-09-26 21:00:51 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-26 21:00:51 -0700 |
commit | f4bf581b96347b8d7f115eca74fa84a644eb729c (patch) | |
tree | c1e42376edb8d2e5a6094854dd1ac4320f0c6f23 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | |
parent | Fixed a bug with link-region. (diff) | |
download | opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.zip opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.gz opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.bz2 opensim-SC_OLD-f4bf581b96347b8d7f115eca74fa84a644eb729c.tar.xz |
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 41f96b3..9bf31a4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | |||
@@ -37,6 +37,7 @@ 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.Grid; |
40 | using OpenSim.Services.Interfaces; | ||
40 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
41 | 42 | ||
42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid |
@@ -95,20 +96,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
95 | if (!m_Enabled) | 96 | if (!m_Enabled) |
96 | return; | 97 | return; |
97 | 98 | ||
98 | if (!m_Registered) | ||
99 | { | ||
100 | m_Registered = true; | ||
101 | |||
102 | m_log.Info("[HypergridService]: Starting..."); | ||
103 | |||
104 | Object[] args = new Object[] { m_Config, MainServer.Instance }; | ||
105 | |||
106 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance); | ||
107 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | ||
108 | } | ||
109 | |||
110 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
111 | m_HypergridHandler.AddRegion(rinfo); | ||
112 | } | 99 | } |
113 | 100 | ||
114 | public void RemoveRegion(Scene scene) | 101 | public void RemoveRegion(Scene scene) |
@@ -122,6 +109,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
122 | 109 | ||
123 | public void RegionLoaded(Scene scene) | 110 | public void RegionLoaded(Scene scene) |
124 | { | 111 | { |
112 | if (!m_Registered) | ||
113 | { | ||
114 | m_Registered = true; | ||
115 | |||
116 | m_log.Info("[HypergridService]: Starting..."); | ||
117 | |||
118 | Object[] args = new Object[] { m_Config, MainServer.Instance }; | ||
119 | |||
120 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); | ||
121 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | ||
122 | } | ||
123 | |||
124 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
125 | m_HypergridHandler.AddRegion(rinfo); | ||
125 | } | 126 | } |
126 | 127 | ||
127 | #endregion | 128 | #endregion |