diff options
| author | UbitUmarov | 2012-03-04 04:11:38 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-04 04:11:38 +0000 |
| commit | 99bb3ccb3d375a56a4bd2ba9260660d6cf839cb9 (patch) | |
| tree | 23d02ed1aed47dd1cbea40a1d4dbab6cd99e84d2 /OpenSim/Region | |
| parent | update UbitODE (diff) | |
| parent | Zero velocity when drag-copying (diff) | |
| download | opensim-SC-99bb3ccb3d375a56a4bd2ba9260660d6cf839cb9.zip opensim-SC-99bb3ccb3d375a56a4bd2ba9260660d6cf839cb9.tar.gz opensim-SC-99bb3ccb3d375a56a4bd2ba9260660d6cf839cb9.tar.bz2 opensim-SC-99bb3ccb3d375a56a4bd2ba9260660d6cf839cb9.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fefae9d..c9ea8e4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1989,6 +1989,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1989 | public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) | 1989 | public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) |
| 1990 | { | 1990 | { |
| 1991 | SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed)); | 1991 | SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed)); |
| 1992 | if (userExposed) | ||
| 1993 | RootPart.Velocity = Vector3.Zero; // In case source is moving | ||
| 1992 | } | 1994 | } |
| 1993 | 1995 | ||
| 1994 | public void ScriptSetPhysicsStatus(bool usePhysics) | 1996 | public void ScriptSetPhysicsStatus(bool usePhysics) |