aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMelanie2012-04-25 02:33:39 +0100
committerMelanie2012-04-25 02:33:39 +0100
commit9a235018247cb8dfe07043c354b31da155d19e1f (patch)
treedb8c223bc505a0bf9437d3550f4a101d24874545 /OpenSim/Region/OptionalModules
parentMerge branch 'master' into careminster (diff)
parentrefactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff)
downloadopensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.zip
opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz
opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2
opensim-SC_OLD-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-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