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

refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-01 23:49:38 +01:00
parent cc8897127b
commit 3e86064d6b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -946,6 +946,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// group.Name, group.LocalId, group.UUID, remoteClient.Name); // group.Name, group.LocalId, group.UUID, remoteClient.Name);
} }
DoPostRezWhenFromItem(item, attachment);
return group;
}
private void DoPostRezWhenFromItem(InventoryItemBase item, bool isAttachment)
{
if (!m_Scene.Permissions.BypassPermissions()) if (!m_Scene.Permissions.BypassPermissions())
{ {
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
@ -953,7 +960,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// If this is done on attachments, no // If this is done on attachments, no
// copy ones will be lost, so avoid it // copy ones will be lost, so avoid it
// //
if (!attachment) if (!isAttachment)
{ {
List<UUID> uuids = new List<UUID>(); List<UUID> uuids = new List<UUID>();
uuids.Add(item.ID); uuids.Add(item.ID);
@ -961,8 +968,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
} }
} }
return group;
} }
protected void AddUserData(SceneObjectGroup sog) protected void AddUserData(SceneObjectGroup sog)