diff options
author | Justin Clarke Casey | 2009-01-15 21:27:55 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-15 21:27:55 +0000 |
commit | 093adb2113d748f28554393cc8a6fe53502126dc (patch) | |
tree | 5565cca869b7a83845efc129f21e5f1219c16adf /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | Small bit of refactoring related to the hypergrid link loading from xml files. (diff) | |
download | opensim-SC-093adb2113d748f28554393cc8a6fe53502126dc.zip opensim-SC-093adb2113d748f28554393cc8a6fe53502126dc.tar.gz opensim-SC-093adb2113d748f28554393cc8a6fe53502126dc.tar.bz2 opensim-SC-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/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index ab4e7d8..65e62ef 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -701,6 +701,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
701 | position, avatar.Name, avatar.UUID, emergencyPos); | 701 | position, avatar.Name, avatar.UUID, emergencyPos); |
702 | position = emergencyPos; | 702 | position = emergencyPos; |
703 | } | 703 | } |
704 | |||
704 | // TODO: Get proper AVG Height | 705 | // TODO: Get proper AVG Height |
705 | float localAVHeight = 1.56f; | 706 | float localAVHeight = 1.56f; |
706 | float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y); | 707 | float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y); |
@@ -713,7 +714,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
713 | // Only send this if the event queue is null | 714 | // Only send this if the event queue is null |
714 | if (eq == null) | 715 | if (eq == null) |
715 | avatar.ControllingClient.SendTeleportLocationStart(); | 716 | avatar.ControllingClient.SendTeleportLocationStart(); |
716 | |||
717 | 717 | ||
718 | avatar.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); | 718 | avatar.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); |
719 | avatar.Teleport(position); | 719 | avatar.Teleport(position); |