aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs36
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
2 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a2a7392..8e3c688 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1526,14 +1526,14 @@ namespace OpenSim.Region.Framework.Scenes
1526 return; 1526 return;
1527 1527
1528 if (part.OwnerID != remoteClient.AgentId) 1528 if (part.OwnerID != remoteClient.AgentId)
1529 { 1529 {
1530 // Group permissions 1530 // Group permissions
1531 if ( (part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0) ) 1531 if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
1532 return; 1532 return;
1533 } else { 1533 } else {
1534 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) 1534 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
1535 return; 1535 return;
1536 } 1536 }
1537 1537
1538 if (!Permissions.CanCreateObjectInventory( 1538 if (!Permissions.CanCreateObjectInventory(
1539 itemBase.InvType, part.UUID, remoteClient.AgentId)) 1539 itemBase.InvType, part.UUID, remoteClient.AgentId))
@@ -1602,18 +1602,18 @@ namespace OpenSim.Region.Framework.Scenes
1602 destId); 1602 destId);
1603 return; 1603 return;
1604 } 1604 }
1605 1605
1606 // Must own the object, and have modify rights 1606 // Must own the object, and have modify rights
1607 if (srcPart.OwnerID != destPart.OwnerID) 1607 if (srcPart.OwnerID != destPart.OwnerID)
1608 { 1608 {
1609 // Group permissions 1609 // Group permissions
1610 if ( (destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) || 1610 if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
1611 ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0) ) 1611 ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0))
1612 return; 1612 return;
1613 } else { 1613 } else {
1614 if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0) 1614 if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
1615 return; 1615 return;
1616 } 1616 }
1617 1617
1618 if (destPart.ScriptAccessPin != pin) 1618 if (destPart.ScriptAccessPin != pin)
1619 { 1619 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9cfc84f..d18af46 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Framework.Scenes
136 { 136 {
137 m_AssetService = RequestModuleInterface<IAssetService>(); 137 m_AssetService = RequestModuleInterface<IAssetService>();
138 138
139 if( m_AssetService == null ) 139 if (m_AssetService == null)
140 { 140 {
141 throw new Exception("No IAssetService available."); 141 throw new Exception("No IAssetService available.");
142 } 142 }
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.Framework.Scenes
1097 1097
1098 IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>(); 1098 IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>();
1099 if (tr != null) 1099 if (tr != null)
1100 tr.SendInstantMessage(msg, delegate(bool success) {} ); 1100 tr.SendInstantMessage(msg, delegate(bool success) {});
1101 } 1101 }
1102 m_returns.Clear(); 1102 m_returns.Clear();
1103 } 1103 }
@@ -1465,7 +1465,7 @@ namespace OpenSim.Region.Framework.Scenes
1465 1465
1466 foreach (SceneObjectPart part in group.Children.Values) 1466 foreach (SceneObjectPart part in group.Children.Values)
1467 { 1467 {
1468 if (part.IsJoint() && ((part.ObjectFlags&(uint)PrimFlags.Physics) != 0) ) 1468 if (part.IsJoint() && ((part.ObjectFlags&(uint)PrimFlags.Physics) != 0))
1469 { 1469 {
1470 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? 1470 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
1471 } 1471 }