aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-05-04 18:39:04 +0100
committerMelanie2010-05-04 18:39:04 +0100
commit585259ef08cc0431a479a2ac361129bf7f0e1317 (patch)
tree24ce5501226ed90777089dde76b2387a058f6be5 /OpenSim/Region
parentAdd events to the estate interface to let interested modules know of (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.zip
opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.gz
opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.bz2
opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs5
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index c6848bb..235914a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -113,10 +113,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
113 113
114 ISimulationService simService = scene.RequestModuleInterface<ISimulationService>(); 114 ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
115 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService); 115 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
116 scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper);
117 116
118 new UserAgentServerConnector(m_Config, MainServer.Instance); 117 new UserAgentServerConnector(m_Config, MainServer.Instance);
119 } 118 }
119 scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper);
120 } 120 }
121 121
122 #endregion 122 #endregion
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 2c234d2..d44ddf4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -191,10 +191,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
191 public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) 191 public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
192 { 192 {
193 List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber); 193 List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
194 //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Local GetRegionsByName {0} found {1} regions", name, rinfo.Count);
194 List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber); 195 List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber);
195 196
196 if (grinfo != null) 197 if (grinfo != null)
198 {
199 //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetRegionsByName {0} found {1} regions", name, grinfo.Count);
197 rinfo.AddRange(grinfo); 200 rinfo.AddRange(grinfo);
201 }
202
198 return rinfo; 203 return rinfo;
199 } 204 }
200 205