aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-01 23:49:38 +0100
committerJustin Clark-Casey (justincc)2011-09-01 23:49:38 +0100
commit3e86064d6bdf46eb3dcbb9e9058cd7226f9e5367 (patch)
tree82cb9953573914f448d99ec7138dee0b5014738a
parentremove the pointless m_Scene.GetNewRezLocation() call at the top of IAM.RezOb... (diff)
downloadopensim-SC-3e86064d6bdf46eb3dcbb9e9058cd7226f9e5367.zip
opensim-SC-3e86064d6bdf46eb3dcbb9e9058cd7226f9e5367.tar.gz
opensim-SC-3e86064d6bdf46eb3dcbb9e9058cd7226f9e5367.tar.bz2
opensim-SC-3e86064d6bdf46eb3dcbb9e9058cd7226f9e5367.tar.xz
refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 9cad003..41f0e8c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -946,6 +946,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
946// group.Name, group.LocalId, group.UUID, remoteClient.Name); 946// group.Name, group.LocalId, group.UUID, remoteClient.Name);
947 } 947 }
948 948
949 DoPostRezWhenFromItem(item, attachment);
950
951 return group;
952 }
953
954 private void DoPostRezWhenFromItem(InventoryItemBase item, bool isAttachment)
955 {
949 if (!m_Scene.Permissions.BypassPermissions()) 956 if (!m_Scene.Permissions.BypassPermissions())
950 { 957 {
951 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 958 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
@@ -953,7 +960,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
953 // If this is done on attachments, no 960 // If this is done on attachments, no
954 // copy ones will be lost, so avoid it 961 // copy ones will be lost, so avoid it
955 // 962 //
956 if (!attachment) 963 if (!isAttachment)
957 { 964 {
958 List<UUID> uuids = new List<UUID>(); 965 List<UUID> uuids = new List<UUID>();
959 uuids.Add(item.ID); 966 uuids.Add(item.ID);
@@ -961,8 +968,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
961 } 968 }
962 } 969 }
963 } 970 }
964
965 return group;
966 } 971 }
967 972
968 protected void AddUserData(SceneObjectGroup sog) 973 protected void AddUserData(SceneObjectGroup sog)