diff options
author | UbitUmarov | 2012-04-19 01:52:23 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-19 01:52:23 +0100 |
commit | 9b02e1cf4a32fc75c3ec04e1023e3739a0767355 (patch) | |
tree | a0b4b9c0d3232796b0fa21e8d6e4bd0407e0f4b5 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | ubitODE still retouching character pid (diff) | |
parent | Allow setting a specific target velocity on TeleportWithMomentum (diff) | |
download | opensim-SC-9b02e1cf4a32fc75c3ec04e1023e3739a0767355.zip opensim-SC-9b02e1cf4a32fc75c3ec04e1023e3739a0767355.tar.gz opensim-SC-9b02e1cf4a32fc75c3ec04e1023e3739a0767355.tar.bz2 opensim-SC-9b02e1cf4a32fc75c3ec04e1023e3739a0767355.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3fd1f5e..47020af 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1941,6 +1941,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1941 | // "[SCENE]: Storing {0}, {1} in {2}", | 1941 | // "[SCENE]: Storing {0}, {1} in {2}", |
1942 | // Name, UUID, m_scene.RegionInfo.RegionName); | 1942 | // Name, UUID, m_scene.RegionInfo.RegionName); |
1943 | 1943 | ||
1944 | if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0) | ||
1945 | { | ||
1946 | RootPart.Shape.State = 0; | ||
1947 | ScheduleGroupForFullUpdate(); | ||
1948 | } | ||
1949 | |||
1944 | SceneObjectGroup backup_group = Copy(false); | 1950 | SceneObjectGroup backup_group = Copy(false); |
1945 | backup_group.RootPart.Velocity = RootPart.Velocity; | 1951 | backup_group.RootPart.Velocity = RootPart.Velocity; |
1946 | backup_group.RootPart.Acceleration = RootPart.Acceleration; | 1952 | backup_group.RootPart.Acceleration = RootPart.Acceleration; |