aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dd780b7..9e52b00 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1348,7 +1348,7 @@ namespace OpenSim.Region.Framework.Scenes
1348 public void AddFlag(PrimFlags flag) 1348 public void AddFlag(PrimFlags flag)
1349 { 1349 {
1350 // PrimFlags prevflag = Flags; 1350 // PrimFlags prevflag = Flags;
1351 if ((ObjectFlags & (uint) flag) == 0) 1351 if ((Flags & flag) == 0)
1352 { 1352 {
1353 //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString()); 1353 //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString());
1354 Flags |= flag; 1354 Flags |= flag;
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.Framework.Scenes
1638 dupe.Velocity = new Vector3(0, 0, 0); 1638 dupe.Velocity = new Vector3(0, 0, 0);
1639 dupe.Acceleration = new Vector3(0, 0, 0); 1639 dupe.Acceleration = new Vector3(0, 0, 0);
1640 dupe.AngularVelocity = new Vector3(0, 0, 0); 1640 dupe.AngularVelocity = new Vector3(0, 0, 0);
1641 dupe.ObjectFlags = ObjectFlags; 1641 dupe.Flags = Flags;
1642 1642
1643 dupe._ownershipCost = _ownershipCost; 1643 dupe._ownershipCost = _ownershipCost;
1644 dupe._objectSaleType = _objectSaleType; 1644 dupe._objectSaleType = _objectSaleType;
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.Framework.Scenes
1675 m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived); 1675 m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived);
1676 } 1676 }
1677 1677
1678 bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0); 1678 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0);
1679 dupe.DoPhysicsPropertyUpdate(UsePhysics, true); 1679 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
1680 } 1680 }
1681 1681
@@ -4299,9 +4299,9 @@ namespace OpenSim.Region.Framework.Scenes
4299 4299
4300 public void UpdatePrimFlags(bool UsePhysics, bool IsTemporary, bool IsPhantom, bool IsVD) 4300 public void UpdatePrimFlags(bool UsePhysics, bool IsTemporary, bool IsPhantom, bool IsVD)
4301 { 4301 {
4302 bool wasUsingPhysics = ((ObjectFlags & (uint) PrimFlags.Physics) != 0); 4302 bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
4303 bool wasTemporary = ((ObjectFlags & (uint)PrimFlags.TemporaryOnRez) != 0); 4303 bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
4304 bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); 4304 bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
4305 bool wasVD = VolumeDetectActive; 4305 bool wasVD = VolumeDetectActive;
4306 4306
4307 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD)) 4307 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))