* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.

* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs
index a863697..5b99d7d 100644
--- a/OpenSim/Region/Application/HGCommands.cs
+++ b/OpenSim/Region/Application/HGCommands.cs
@@ -47,7 +47,7 @@ namespace OpenSim
         public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, 
             StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version)
         {
-            HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService();
+            SceneCommunicationService sceneGridService = new SceneCommunicationService();
 
             return
                 new HGScene(
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 9f5e173..546a1d1 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -414,7 +414,7 @@ namespace OpenSim
 
             foreach (ScenePresence presence in agents)
             {
-                RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
+                RegionInfo regionInfo = presence.Scene.RegionInfo;
 
                 if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) &&
                     presence.Lastname.ToLower().Contains(cmdparams[3].ToLower()))
@@ -908,7 +908,7 @@ namespace OpenSim
 
                     foreach (ScenePresence presence in agents)
                     {
-                        RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
+                        RegionInfo regionInfo = presence.Scene.RegionInfo;
                         string regionName;
 
                         if (regionInfo == null)