diff options
author | Justin Clark-Casey (justincc) | 2012-05-21 21:00:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-21 21:00:22 +0100 |
commit | 7e97f0e8989ff1bc7fab80c726dfef23dffc5cca (patch) | |
tree | 76eee2fc62319beedd857f474d74a912964aeadc /OpenSim | |
parent | Fix bug where outfit folders could not be renamed. (diff) | |
download | opensim-SC_OLD-7e97f0e8989ff1bc7fab80c726dfef23dffc5cca.zip opensim-SC_OLD-7e97f0e8989ff1bc7fab80c726dfef23dffc5cca.tar.gz opensim-SC_OLD-7e97f0e8989ff1bc7fab80c726dfef23dffc5cca.tar.bz2 opensim-SC_OLD-7e97f0e8989ff1bc7fab80c726dfef23dffc5cca.tar.xz |
minor: extend commented out LinkInventoryItem log message for future use
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8a26df1..79c9309 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -939,8 +939,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
939 | sbyte invType, sbyte type, UUID olditemID) | 939 | sbyte invType, sbyte type, UUID olditemID) |
940 | { | 940 | { |
941 | // m_log.DebugFormat( | 941 | // m_log.DebugFormat( |
942 | // "[AGENT INVENTORY]: Received request from {0} to create inventory item link {1} in folder {2} pointing to {3}", | 942 | // "[AGENT INVENTORY]: Received request from {0} to create inventory item link {1} in folder {2} pointing to {3}, assetType {4}, inventoryType {5}", |
943 | // remoteClient.Name, name, folderID, olditemID); | 943 | // remoteClient.Name, name, folderID, olditemID, (AssetType)type, (InventoryType)invType); |
944 | 944 | ||
945 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) | 945 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) |
946 | return; | 946 | return; |
@@ -973,10 +973,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
973 | asset.Type = type; | 973 | asset.Type = type; |
974 | asset.Name = name; | 974 | asset.Name = name; |
975 | asset.Description = description; | 975 | asset.Description = description; |
976 | 976 | ||
977 | CreateNewInventoryItem( | 977 | CreateNewInventoryItem( |
978 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType, | 978 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType, |
979 | (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, | 979 | (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, |
980 | (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch()); | 980 | (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch()); |
981 | } | 981 | } |
982 | else | 982 | else |
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 2ce1bab..3355428 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -302,7 +302,8 @@ namespace OpenSim.Services.InventoryService | |||
302 | 302 | ||
303 | public virtual bool AddFolder(InventoryFolderBase folder) | 303 | public virtual bool AddFolder(InventoryFolderBase folder) |
304 | { | 304 | { |
305 | //m_log.DebugFormat("[XINVENTORY]: Add folder {0} type {1} in parent {2}", folder.Name, folder.Type, folder.ParentID); | 305 | // m_log.DebugFormat("[XINVENTORY]: Add folder {0} type {1} in parent {2}", folder.Name, folder.Type, folder.ParentID); |
306 | |||
306 | InventoryFolderBase check = GetFolder(folder); | 307 | InventoryFolderBase check = GetFolder(folder); |
307 | if (check != null) | 308 | if (check != null) |
308 | return false; | 309 | return false; |
@@ -346,7 +347,7 @@ namespace OpenSim.Services.InventoryService | |||
346 | 347 | ||
347 | check.Version = (ushort)xFolder.version; | 348 | check.Version = (ushort)xFolder.version; |
348 | xFolder = ConvertFromOpenSim(check); | 349 | xFolder = ConvertFromOpenSim(check); |
349 | 350 | ||
350 | // m_log.DebugFormat( | 351 | // m_log.DebugFormat( |
351 | // "[XINVENTORY]: Storing version only update to system folder {0} {1} {2}", | 352 | // "[XINVENTORY]: Storing version only update to system folder {0} {1} {2}", |
352 | // xFolder.folderName, xFolder.version, xFolder.type); | 353 | // xFolder.folderName, xFolder.version, xFolder.type); |
@@ -442,7 +443,6 @@ namespace OpenSim.Services.InventoryService | |||
442 | 443 | ||
443 | public virtual bool UpdateItem(InventoryItemBase item) | 444 | public virtual bool UpdateItem(InventoryItemBase item) |
444 | { | 445 | { |
445 | // throw new Exception("urrgh"); | ||
446 | if (!m_AllowDelete) | 446 | if (!m_AllowDelete) |
447 | if (item.AssetType == (sbyte)AssetType.Link || item.AssetType == (sbyte)AssetType.LinkFolder) | 447 | if (item.AssetType == (sbyte)AssetType.Link || item.AssetType == (sbyte)AssetType.LinkFolder) |
448 | return false; | 448 | return false; |