OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Refactored away permissions and physics flag duplications

afrisby
lbsa71 2007-11-30 09:42:36 +00:00
parent 0d5d111619
commit 6e22faf73e
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -467,17 +467,8 @@ namespace OpenSim.Region.Environment.Scenes
LLObject.ObjectFlags.CreateSelected | LLObject.ObjectFlags.CreateSelected |
LLObject.ObjectFlags.ObjectOwnerModify; LLObject.ObjectFlags.ObjectOwnerModify;
if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions) ApplyPermissions();
{ ApplyPhysics();
EveryoneMask = (uint)m_flags;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOwner;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectModify;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectMove;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectAnyOwner;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOfficer;
}
ScheduleFullUpdate(); ScheduleFullUpdate();
} }
@ -505,36 +496,19 @@ namespace OpenSim.Region.Environment.Scenes
LastOwnerID = lastOwnerID; LastOwnerID = lastOwnerID;
UUID = LLUUID.Random(); UUID = LLUUID.Random();
LocalID = (uint) (localID); LocalID = (uint) (localID);
// Todo: Add More parameters from above
Shape = shape; Shape = shape;
OwnershipCost = 0; OwnershipCost = 0;
ObjectSaleType = (byte)0; ObjectSaleType = (byte)0;
SalePrice = 0; SalePrice = 0;
Category = (uint)0; Category = (uint)0;
// End Todo: ///
LastOwnerID = CreatorID; LastOwnerID = CreatorID;
OffsetPosition = position; OffsetPosition = position;
RotationOffset = rotation; RotationOffset = rotation;
ObjectFlags = flags; ObjectFlags = flags;
if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions) ApplyPermissions();
{ ApplyPhysics();
EveryoneMask = (uint)m_flags;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOwner;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectModify;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectMove;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectAnyOwner;
EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOfficer;
}
else
{
EveryoneMask = ObjectFlags;
}
bool UsePhysics = ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0);
DoPhysicsPropertyUpdate(UsePhysics, true);
ScheduleFullUpdate(); ScheduleFullUpdate();
} }