aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-04-17 23:39:41 +0200
committerMelanie2012-04-17 23:39:41 +0200
commit0fe0b2ceec2440ff284d7a494d090ce43449fd97 (patch)
treea4ccaf9e24262ec26f624d34b9011456380b4a54 /OpenSim/Region/Framework/Scenes
parentMerge branch 'ubitwork' (diff)
downloadopensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.zip
opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.gz
opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.bz2
opensim-SC-0fe0b2ceec2440ff284d7a494d090ce43449fd97.tar.xz
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
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;