aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-18 13:37:02 +0000
committerTeravus Ovares2007-11-18 13:37:02 +0000
commit46ccfa1741abbf445b49e79045e649798d1c0b63 (patch)
tree44a5495e2026a57299b819acc0dea790d66c7a33 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentMade the background (ie empty space) colour of the exported map image blue. (diff)
downloadopensim-SC-46ccfa1741abbf445b49e79045e649798d1c0b63.zip
opensim-SC-46ccfa1741abbf445b49e79045e649798d1c0b63.tar.gz
opensim-SC-46ccfa1741abbf445b49e79045e649798d1c0b63.tar.bz2
opensim-SC-46ccfa1741abbf445b49e79045e649798d1c0b63.tar.xz
* Found several cases where prim set physical were not subscribing to physics events.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 38e1609..628bd72 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -480,6 +480,8 @@ namespace OpenSim.Region.Environment.Scenes
480 new Quaternion(dupe.RootPart.RotationOffset.W, dupe.RootPart.RotationOffset.X, 480 new Quaternion(dupe.RootPart.RotationOffset.W, dupe.RootPart.RotationOffset.X,
481 dupe.RootPart.RotationOffset.Y, dupe.RootPart.RotationOffset.Z), 481 dupe.RootPart.RotationOffset.Y, dupe.RootPart.RotationOffset.Z),
482 dupe.RootPart.PhysActor.IsPhysical); 482 dupe.RootPart.PhysActor.IsPhysical);
483 dupe.RootPart.doPhysicsPropertyUpdate(dupe.RootPart.PhysActor.IsPhysical);
484
483 } 485 }
484 // Now we've made a copy that replaces this one, we need to 486 // Now we've made a copy that replaces this one, we need to
485 // switch the owner to the person who did the copying 487 // switch the owner to the person who did the copying
@@ -859,6 +861,8 @@ namespace OpenSim.Region.Environment.Scenes
859 new Quaternion(linkPart.RotationOffset.W, linkPart.RotationOffset.X, 861 new Quaternion(linkPart.RotationOffset.W, linkPart.RotationOffset.X,
860 linkPart.RotationOffset.Y, linkPart.RotationOffset.Z), 862 linkPart.RotationOffset.Y, linkPart.RotationOffset.Z),
861 m_rootPart.PhysActor.IsPhysical); 863 m_rootPart.PhysActor.IsPhysical);
864 m_rootPart.doPhysicsPropertyUpdate(m_rootPart.PhysActor.IsPhysical);
865
862 } 866 }
863 867
864 SceneObjectGroup objectGroup = new SceneObjectGroup(m_scene, m_regionHandle, linkPart); 868 SceneObjectGroup objectGroup = new SceneObjectGroup(m_scene, m_regionHandle, linkPart);
@@ -1165,6 +1169,9 @@ namespace OpenSim.Region.Environment.Scenes
1165 new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X, 1169 new Quaternion(m_rootPart.RotationOffset.W, m_rootPart.RotationOffset.X,
1166 m_rootPart.RotationOffset.Y, m_rootPart.RotationOffset.Z), 1170 m_rootPart.RotationOffset.Y, m_rootPart.RotationOffset.Z),
1167 m_rootPart.PhysActor.IsPhysical); 1171 m_rootPart.PhysActor.IsPhysical);
1172 bool UsePhysics = ((m_rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0);
1173 m_rootPart.doPhysicsPropertyUpdate(UsePhysics);
1174
1168 } 1175 }
1169 } 1176 }
1170 1177