aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-15 21:27:55 +0000
committerJustin Clarke Casey2009-01-15 21:27:55 +0000
commit093adb2113d748f28554393cc8a6fe53502126dc (patch)
tree5565cca869b7a83845efc129f21e5f1219c16adf /OpenSim/Region/Environment/Scenes/Scene.cs
parentSmall bit of refactoring related to the hypergrid link loading from xml files. (diff)
downloadopensim-SC_OLD-093adb2113d748f28554393cc8a6fe53502126dc.zip
opensim-SC_OLD-093adb2113d748f28554393cc8a6fe53502126dc.tar.gz
opensim-SC_OLD-093adb2113d748f28554393cc8a6fe53502126dc.tar.bz2
opensim-SC_OLD-093adb2113d748f28554393cc8a6fe53502126dc.tar.xz
* Add new unit test for simple teleport in a standalone.
* Does not yet check results.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 94ca07c..fad90fa 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3129,6 +3129,7 @@ namespace OpenSim.Region.Environment.Scenes
3129 remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found."); 3129 remoteClient.SendTeleportFailed("The region '" + regionName + "' could not be found.");
3130 return; 3130 return;
3131 } 3131 }
3132
3132 RequestTeleportLocation(remoteClient, regionInfo.RegionHandle, position, lookat, teleportFlags); 3133 RequestTeleportLocation(remoteClient, regionInfo.RegionHandle, position, lookat, teleportFlags);
3133 } 3134 }
3134 3135
@@ -3149,7 +3150,8 @@ namespace OpenSim.Region.Environment.Scenes
3149 if (m_scenePresences.ContainsKey(remoteClient.AgentId)) 3150 if (m_scenePresences.ContainsKey(remoteClient.AgentId))
3150 sp = m_scenePresences[remoteClient.AgentId]; 3151 sp = m_scenePresences[remoteClient.AgentId];
3151 } 3152 }
3152 if (sp!= null) 3153
3154 if (sp != null)
3153 { 3155 {
3154 m_sceneGridService.RequestTeleportToLocation(sp, regionHandle, 3156 m_sceneGridService.RequestTeleportToLocation(sp, regionHandle,
3155 position, lookAt, teleportFlags); 3157 position, lookAt, teleportFlags);