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 33aa8ee..2ad4223 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1324,7 +1324,7 @@ namespace OpenSim.Region.Framework.Scenes
1324 public void AddFlag(PrimFlags flag) 1324 public void AddFlag(PrimFlags flag)
1325 { 1325 {
1326 // PrimFlags prevflag = Flags; 1326 // PrimFlags prevflag = Flags;
1327 if ((ObjectFlags & (uint) flag) == 0) 1327 if ((Flags & flag) == 0)
1328 { 1328 {
1329 //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString()); 1329 //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString());
1330 Flags |= flag; 1330 Flags |= flag;
@@ -1607,7 +1607,7 @@ namespace OpenSim.Region.Framework.Scenes
1607 dupe.Velocity = new Vector3(0, 0, 0); 1607 dupe.Velocity = new Vector3(0, 0, 0);
1608 dupe.Acceleration = new Vector3(0, 0, 0); 1608 dupe.Acceleration = new Vector3(0, 0, 0);
1609 dupe.AngularVelocity = new Vector3(0, 0, 0); 1609 dupe.AngularVelocity = new Vector3(0, 0, 0);
1610 dupe.ObjectFlags = ObjectFlags; 1610 dupe.Flags = Flags;
1611 1611
1612 dupe._ownershipCost = _ownershipCost; 1612 dupe._ownershipCost = _ownershipCost;
1613 dupe._objectSaleType = _objectSaleType; 1613 dupe._objectSaleType = _objectSaleType;
@@ -1644,7 +1644,7 @@ namespace OpenSim.Region.Framework.Scenes
1644 m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived); 1644 m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived);
1645 } 1645 }
1646 1646
1647 bool UsePhysics = ((dupe.ObjectFlags & (uint)PrimFlags.Physics) != 0); 1647 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0);
1648 dupe.DoPhysicsPropertyUpdate(UsePhysics, true); 1648 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
1649 } 1649 }
1650 1650
@@ -4271,9 +4271,9 @@ namespace OpenSim.Region.Framework.Scenes
4271 4271
4272 public void UpdatePrimFlags(bool UsePhysics, bool IsTemporary, bool IsPhantom, bool IsVD) 4272 public void UpdatePrimFlags(bool UsePhysics, bool IsTemporary, bool IsPhantom, bool IsVD)
4273 { 4273 {
4274 bool wasUsingPhysics = ((ObjectFlags & (uint) PrimFlags.Physics) != 0); 4274 bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
4275 bool wasTemporary = ((ObjectFlags & (uint)PrimFlags.TemporaryOnRez) != 0); 4275 bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
4276 bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0); 4276 bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
4277 bool wasVD = VolumeDetectActive; 4277 bool wasVD = VolumeDetectActive;
4278 4278
4279 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD)) 4279 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == IsTemporary) && (wasPhantom == IsPhantom) && (IsVD==wasVD))