mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
Formatting cleanup.
This commit is contained in:
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
if (part != null)
|
||||
{
|
||||
part.StartScript(itemID);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -58,9 +58,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
"[PRIM INVENTORY]: " +
|
||||
"Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
|
||||
localID, Name, UUID, itemID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// /// Start a given script.
|
||||
// /// </summary>
|
||||
// /// <param name="localID">
|
||||
@@ -79,9 +79,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
// "[PRIM INVENTORY]: " +
|
||||
// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
|
||||
// localID, Name, UUID, itemID);
|
||||
// }
|
||||
// }
|
||||
|
||||
// }
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// Start the scripts contained in all the prims in this group.
|
||||
/// </summary>
|
||||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Start a given script.
|
||||
/// </summary>
|
||||
/// <param name="localID">
|
||||
@@ -127,11 +127,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
"[PRIM INVENTORY]: " +
|
||||
"Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
|
||||
partID, Name, UUID, itemID);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="remoteClient"></param>
|
||||
/// <param name="localID"></param>
|
||||
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
localID, Name, UUID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Add an inventory item to a prim in this group.
|
||||
/// </summary>
|
||||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
/// <param name="item"></param>
|
||||
/// <param name="copyItemID">The item UUID that should be used by the new item.</param>
|
||||
/// <returns></returns>
|
||||
public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
|
||||
public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
|
||||
InventoryItemBase item, LLUUID copyItemID)
|
||||
{
|
||||
LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID;
|
||||
@@ -190,8 +190,8 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
if (part != null)
|
||||
{
|
||||
TaskInventoryItem taskItem = new TaskInventoryItem();
|
||||
|
||||
taskItem.ItemID = newItemId;
|
||||
|
||||
taskItem.ItemID = newItemId;
|
||||
taskItem.AssetID = item.AssetID;
|
||||
taskItem.Name = item.Name;
|
||||
taskItem.Description = item.Description;
|
||||
@@ -199,15 +199,15 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
taskItem.CreatorID = item.Creator;
|
||||
taskItem.Type = item.AssetType;
|
||||
taskItem.InvType = item.InvType;
|
||||
|
||||
|
||||
taskItem.BaseMask = item.BasePermissions;
|
||||
taskItem.OwnerMask = item.CurrentPermissions;
|
||||
// FIXME: ignoring group permissions for now as they aren't stored in item
|
||||
taskItem.EveryoneMask = item.EveryOnePermissions;
|
||||
taskItem.NextOwnerMask = item.NextPermissions;
|
||||
|
||||
|
||||
part.AddInventoryItem(taskItem);
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Returns an existing inventory item. Returns the original, so any changes will be live.
|
||||
/// </summary>
|
||||
@@ -240,11 +240,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
"[PRIM INVENTORY]: " +
|
||||
"Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
|
||||
primID, part.Name, part.UUID, itemID);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update an existing inventory item.
|
||||
/// </summary>
|
||||
@@ -256,8 +256,8 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
SceneObjectPart part = GetChildPart(item.ParentPartID);
|
||||
if (part != null)
|
||||
{
|
||||
part.UpdateInventoryItem(item);
|
||||
|
||||
part.UpdateInventoryItem(item);
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -266,55 +266,55 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
"[PRIM INVENTORY]: " +
|
||||
"Couldn't find prim ID {0} to update item {1}, {2}",
|
||||
item.ParentPartID, item.Name, item.ItemID);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public int RemoveInventoryItem(uint localID, LLUUID itemID)
|
||||
{
|
||||
SceneObjectPart part = GetChildPart(localID);
|
||||
if (part != null)
|
||||
{
|
||||
{
|
||||
int type = part.RemoveInventoryItem(itemID);
|
||||
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
public uint GetEffectivePermissions()
|
||||
{
|
||||
uint perms=(uint)(PermissionMask.Modify |
|
||||
PermissionMask.Copy |
|
||||
PermissionMask.Move |
|
||||
PermissionMask.Transfer) | 7;
|
||||
public uint GetEffectivePermissions()
|
||||
{
|
||||
uint perms=(uint)(PermissionMask.Modify |
|
||||
PermissionMask.Copy |
|
||||
PermissionMask.Move |
|
||||
PermissionMask.Transfer) | 7;
|
||||
|
||||
foreach (SceneObjectPart part in m_parts.Values)
|
||||
perms &= part.MaskEffectivePermissions();
|
||||
foreach (SceneObjectPart part in m_parts.Values)
|
||||
perms &= part.MaskEffectivePermissions();
|
||||
|
||||
if((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
|
||||
perms &= ~(uint)PermissionMask.Modify;
|
||||
if((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0)
|
||||
perms &= ~(uint)PermissionMask.Copy;
|
||||
if((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0)
|
||||
perms &= ~(uint)PermissionMask.Transfer;
|
||||
if ((RootPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
|
||||
perms &= ~(uint)PermissionMask.Modify;
|
||||
if ((RootPart.OwnerMask & (uint)PermissionMask.Copy) == 0)
|
||||
perms &= ~(uint)PermissionMask.Copy;
|
||||
if ((RootPart.OwnerMask & (uint)PermissionMask.Transfer) == 0)
|
||||
perms &= ~(uint)PermissionMask.Transfer;
|
||||
|
||||
if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
|
||||
perms &= ~((uint)PermissionMask.Modify >> 13);
|
||||
if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
|
||||
perms &= ~((uint)PermissionMask.Copy >> 13);
|
||||
if((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
|
||||
perms &= ~((uint)PermissionMask.Transfer >> 13);
|
||||
if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
|
||||
perms &= ~((uint)PermissionMask.Modify >> 13);
|
||||
if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
|
||||
perms &= ~((uint)PermissionMask.Copy >> 13);
|
||||
if ((RootPart.OwnerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
|
||||
perms &= ~((uint)PermissionMask.Transfer >> 13);
|
||||
|
||||
return perms;
|
||||
}
|
||||
return perms;
|
||||
}
|
||||
|
||||
public void ApplyNextOwnerPermissions()
|
||||
{
|
||||
foreach (SceneObjectPart part in m_parts.Values)
|
||||
part.ApplyNextOwnerPermissions();
|
||||
}
|
||||
public void ApplyNextOwnerPermissions()
|
||||
{
|
||||
foreach (SceneObjectPart part in m_parts.Values)
|
||||
part.ApplyNextOwnerPermissions();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user