diff options
author | Melanie Thielker | 2008-09-08 23:54:52 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-08 23:54:52 +0000 |
commit | 19c9ea8ca0d5ae447ff6fb9648c7d9e9df4a76bd (patch) | |
tree | 91007d6d7f0baa6ce4e6502cb44556f228459817 /OpenSim | |
parent | Remove casting nastiness in LSL_Api (diff) | |
download | opensim-SC-19c9ea8ca0d5ae447ff6fb9648c7d9e9df4a76bd.zip opensim-SC-19c9ea8ca0d5ae447ff6fb9648c7d9e9df4a76bd.tar.gz opensim-SC-19c9ea8ca0d5ae447ff6fb9648c7d9e9df4a76bd.tar.bz2 opensim-SC-19c9ea8ca0d5ae447ff6fb9648c7d9e9df4a76bd.tar.xz |
Fix an inventory naming regression
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 26e924f..08f8cee 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -290,11 +290,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
290 | /// <param name="item"></param> | 290 | /// <param name="item"></param> |
291 | public void AddInventoryItem(TaskInventoryItem item) | 291 | public void AddInventoryItem(TaskInventoryItem item) |
292 | { | 292 | { |
293 | string name = FindAvailableInventoryName(item.Name); | 293 | AddInventoryItem(item.Name, item); |
294 | if (name == String.Empty) | ||
295 | return; | ||
296 | |||
297 | AddInventoryItem(name, item); | ||
298 | } | 294 | } |
299 | 295 | ||
300 | /// <summary> | 296 | /// <summary> |
@@ -335,6 +331,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
335 | 331 | ||
336 | item.ParentID = UUID; | 332 | item.ParentID = UUID; |
337 | item.ParentPartID = UUID; | 333 | item.ParentPartID = UUID; |
334 | item.Name = name; | ||
338 | 335 | ||
339 | lock (m_taskInventory) | 336 | lock (m_taskInventory) |
340 | { | 337 | { |