aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-15 23:07:23 +0100
committerJustin Clark-Casey (justincc)2011-04-15 23:07:23 +0100
commit9c7f14bf366eaa113ca7a89d3b40a42529e7726e (patch)
tree020a92df48727fd14072fed558d2e69b8ba3c3d6 /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-9c7f14bf366eaa113ca7a89d3b40a42529e7726e.zip
opensim-SC_OLD-9c7f14bf366eaa113ca7a89d3b40a42529e7726e.tar.gz
opensim-SC_OLD-9c7f14bf366eaa113ca7a89d3b40a42529e7726e.tar.bz2
opensim-SC_OLD-9c7f14bf366eaa113ca7a89d3b40a42529e7726e.tar.xz
minor: remove a small amount of code duplication
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 0f2b9a6..5d19025 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -298,17 +298,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
298 Utils.StringToBytes(itemXml), 298 Utils.StringToBytes(itemXml),
299 objlist[0].OwnerID.ToString()); 299 objlist[0].OwnerID.ToString());
300 m_Scene.AssetService.Store(asset); 300 m_Scene.AssetService.Store(asset);
301 assetID = asset.FullID; 301
302 item.AssetID = asset.FullID;
303 assetID = asset.FullID;
302 304
303 if (DeRezAction.SaveToExistingUserInventoryItem == action) 305 if (DeRezAction.SaveToExistingUserInventoryItem == action)
304 { 306 {
305 item.AssetID = asset.FullID;
306 m_Scene.InventoryService.UpdateItem(item); 307 m_Scene.InventoryService.UpdateItem(item);
307 } 308 }
308 else 309 else
309 { 310 {
310 item.AssetID = asset.FullID;
311
312 uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7; 311 uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
313 foreach (SceneObjectGroup grp in objlist) 312 foreach (SceneObjectGroup grp in objlist)
314 effectivePerms &= grp.GetEffectivePermissions(); 313 effectivePerms &= grp.GetEffectivePermissions();