From f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 29 Sep 2009 08:32:59 +0900 Subject: Add copyright header. Formatting cleanup. --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 51bb114..ec262b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -3517,7 +3517,7 @@ if (m_shape != null) { } else { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like - // (mumbles, well, at least if you have infinte CPU powers :-) ) + // (mumbles, well, at least if you have infinte CPU powers :-)) PhysicsActor pa = this.PhysActor; if (pa != null) { -- cgit v1.1 From 2a7bedb5e93cca37093220bfc11cc4ce45e45cfe Mon Sep 17 00:00:00 2001 From: Alan M Webb Date: Tue, 29 Sep 2009 08:35:21 -0400 Subject: This fix addresses the problem where phantom objects do not always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ec262b0..cce45fe 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -3455,6 +3455,7 @@ if (m_shape != null) { RotationOffset, UsePhysics); + pa = PhysActor; if (pa != null) { pa.LocalID = LocalId; @@ -3513,7 +3514,6 @@ if (m_shape != null) { AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active this.VolumeDetectActive = true; } - } else { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like -- cgit v1.1 From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cce45fe..c915e9f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.Framework.Scenes -{ +{ #region Enumerations [Flags] @@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes public IEntityInventory Inventory { get { return m_inventory; } - } + } protected SceneObjectPartInventory m_inventory; [XmlIgnore] @@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes RotationOffset = rotationOffset; Velocity = new Vector3(0, 0, 0); AngularVelocity = new Vector3(0, 0, 0); - Acceleration = new Vector3(0, 0, 0); + Acceleration = new Vector3(0, 0, 0); m_TextureAnimation = new byte[0]; - m_particleSystem = new byte[0]; + m_particleSystem = new byte[0]; // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from @@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes - /// + /// public TaskInventoryDictionary TaskInventory { get { return m_inventory.Items; } @@ -3484,7 +3484,7 @@ if (m_shape != null) { } else // it already has a physical representation { - pa.IsPhysical = UsePhysics; + pa.IsPhysical = UsePhysics; DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim if (m_parentGroup != null) @@ -3775,7 +3775,7 @@ if (m_shape != null) { public override string ToString() { return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup); - } + } #endregion Public Methods @@ -3823,11 +3823,11 @@ if (m_shape != null) { _everyoneMask &= _nextOwnerMask; Inventory.ApplyNextOwnerPermissions(); - } + } public bool CanBeDeleted() { return Inventory.CanBeDeleted(); } - } + } } -- cgit v1.1 From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 09:38:36 +0900 Subject: Formatting cleanup. --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c915e9f..ea6bc9c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes public UUID FromItemID = UUID.Zero; /// - /// The UUID of the user inventory item from which this object was rezzed if this is a root part. + /// The UUID of the user inventory item from which this object was rezzed if this is a root part. /// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item. /// private UUID m_fromUserInventoryItemID = UUID.Zero; @@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes /// /// A relic from when we we thought that prims contained folder objects. In - /// reality, prim == folder + /// reality, prim == folder /// Exposing this is not particularly good, but it's one of the least evils at the moment to see /// folder id from prim inventory item data, since it's not (yet) actually stored with the prim. /// @@ -3386,7 +3386,7 @@ if (m_shape != null) { } else { - IsPhantom = false; + IsPhantom = false; // If volumedetect is active we don't want phantom to be applied. // If this is a new call to VD out of the state "phantom" // this will also cause the prim to be visible to physics -- cgit v1.1