ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2012-04-25 02:33:39 +01:00
parent def65cd94a 683cfc6f82
commit 9a23501824
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
View File

@@ -68,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
public Vector3 WorldPosition
{
get { return GetSP().AbsolutePosition; }
set { GetSP().TeleportWithMomentum(value); }
set { GetSP().Teleport(value); }
}
public bool IsChildAgent