aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-25 02:07:55 +0100
committerJustin Clark-Casey (justincc)2012-04-25 02:07:55 +0100
commit683cfc6f827c15ee70e4651cbcc7b94a01d2f8e3 (patch)
tree230b1011530c1a7455ae4c6cb855e62a49b69266 /OpenSim/Region/OptionalModules/Scripting
parentAdd regression test TestSameRegionTeleport() (diff)
downloadopensim-SC_OLD-683cfc6f827c15ee70e4651cbcc7b94a01d2f8e3.zip
opensim-SC_OLD-683cfc6f827c15ee70e4651cbcc7b94a01d2f8e3.tar.gz
opensim-SC_OLD-683cfc6f827c15ee70e4651cbcc7b94a01d2f8e3.tar.bz2
opensim-SC_OLD-683cfc6f827c15ee70e4651cbcc7b94a01d2f8e3.tar.xz
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 922eaaf..d192309 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
68 public Vector3 WorldPosition 68 public Vector3 WorldPosition
69 { 69 {
70 get { return GetSP().AbsolutePosition; } 70 get { return GetSP().AbsolutePosition; }
71 set { GetSP().TeleportWithMomentum(value); } 71 set { GetSP().Teleport(value); }
72 } 72 }
73 73
74 public bool IsChildAgent 74 public bool IsChildAgent