aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-11-30 09:42:36 +0000
committerlbsa712007-11-30 09:42:36 +0000
commit6e22faf73e437d3c49121d12edc4b5a4f6c7aefd (patch)
treec83ed925e6eee2cc52e6481915112a83a1b5281c
parent* Made RegionUp virtual (diff)
downloadopensim-SC_OLD-6e22faf73e437d3c49121d12edc4b5a4f6c7aefd.zip
opensim-SC_OLD-6e22faf73e437d3c49121d12edc4b5a4f6c7aefd.tar.gz
opensim-SC_OLD-6e22faf73e437d3c49121d12edc4b5a4f6c7aefd.tar.bz2
opensim-SC_OLD-6e22faf73e437d3c49121d12edc4b5a4f6c7aefd.tar.xz
* Refactored away permissions and physics flag duplications
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs36
1 files changed, 5 insertions, 31 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e2e97c5..6770812 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -467,17 +467,8 @@ namespace OpenSim.Region.Environment.Scenes
467 LLObject.ObjectFlags.CreateSelected | 467 LLObject.ObjectFlags.CreateSelected |
468 LLObject.ObjectFlags.ObjectOwnerModify; 468 LLObject.ObjectFlags.ObjectOwnerModify;
469 469
470 if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions) 470 ApplyPermissions();
471 { 471 ApplyPhysics();
472 EveryoneMask = (uint)m_flags;
473 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOwner;
474 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
475 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
476 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectModify;
477 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectMove;
478 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectAnyOwner;
479 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOfficer;
480 }
481 472
482 ScheduleFullUpdate(); 473 ScheduleFullUpdate();
483 } 474 }
@@ -505,36 +496,19 @@ namespace OpenSim.Region.Environment.Scenes
505 LastOwnerID = lastOwnerID; 496 LastOwnerID = lastOwnerID;
506 UUID = LLUUID.Random(); 497 UUID = LLUUID.Random();
507 LocalID = (uint) (localID); 498 LocalID = (uint) (localID);
508 // Todo: Add More parameters from above
509 Shape = shape; 499 Shape = shape;
510 OwnershipCost = 0; 500 OwnershipCost = 0;
511 ObjectSaleType = (byte)0; 501 ObjectSaleType = (byte)0;
512 SalePrice = 0; 502 SalePrice = 0;
513 Category = (uint)0; 503 Category = (uint)0;
514 // End Todo: ///
515 LastOwnerID = CreatorID; 504 LastOwnerID = CreatorID;
516 OffsetPosition = position; 505 OffsetPosition = position;
517 RotationOffset = rotation; 506 RotationOffset = rotation;
518 ObjectFlags = flags; 507 ObjectFlags = flags;
519 508
520 if (!ParentGroup.m_scene.PermissionsMngr.BypassPermissions) 509 ApplyPermissions();
521 { 510 ApplyPhysics();
522 EveryoneMask = (uint)m_flags; 511
523 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOwner;
524 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
525 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
526 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectModify;
527 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectMove;
528 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectAnyOwner;
529 EveryoneMask &= ~(uint)LLObject.ObjectFlags.ObjectYouOfficer;
530 }
531 else
532 {
533 EveryoneMask = ObjectFlags;
534 }
535
536 bool UsePhysics = ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) != 0);
537 DoPhysicsPropertyUpdate(UsePhysics, true);
538 ScheduleFullUpdate(); 512 ScheduleFullUpdate();
539 } 513 }
540 514