diff options
author | Adam Frisby | 2008-04-23 11:52:25 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-23 11:52:25 +0000 |
commit | bca7ab7e363e9c9874a9ab137b60a042b9d1139c (patch) | |
tree | 52150bf5c1514fdad8ff086c84af8e6ae67cbb17 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | * Fix mantis #842 - folders which are created but left named "New Folder" in ... (diff) | |
download | opensim-SC-bca7ab7e363e9c9874a9ab137b60a042b9d1139c.zip opensim-SC-bca7ab7e363e9c9874a9ab137b60a042b9d1139c.tar.gz opensim-SC-bca7ab7e363e9c9874a9ab137b60a042b9d1139c.tar.bz2 opensim-SC-bca7ab7e363e9c9874a9ab137b60a042b9d1139c.tar.xz |
* Applying Mantis #1020 (Animations) - Thanks Melanie.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index c5a1be1..e4a9551 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -730,25 +730,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
730 | 730 | ||
731 | if (item != null) | 731 | if (item != null) |
732 | { | 732 | { |
733 | if (item.AssetType == 0 || item.AssetType == 1 || item.AssetType == 10) | 733 | group.AddInventoryItem(remoteClient, primLocalID, item, copyID); |
734 | { | 734 | m_log.InfoFormat( |
735 | group.AddInventoryItem(remoteClient, primLocalID, item, copyID); | 735 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", |
736 | m_log.InfoFormat( | 736 | item.Name, primLocalID, remoteClient.Name); |
737 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", | 737 | group.GetProperties(remoteClient); |
738 | item.Name, primLocalID, remoteClient.Name); | ||
739 | group.GetProperties(remoteClient); | ||
740 | } | ||
741 | else | ||
742 | { | ||
743 | // XXX Nasty temporary way of stopping things other than sounds, textures and scripts | ||
744 | // from going in a prim's inventory, since other things will not currently work | ||
745 | // See http://opensimulator.org/mantis/view.php?id=711 for the error caused later on | ||
746 | // - to implement requires changes to TaskInventoryItem (which really requires the current | ||
747 | // nasty way it is done to be changed). | ||
748 | m_log.WarnFormat( | ||
749 | "[PRIM INVENTORY]: Sorry, prim inventory storage of asset type {0} is not yet supported", | ||
750 | item.AssetType); | ||
751 | } | ||
752 | } | 738 | } |
753 | else | 739 | else |
754 | { | 740 | { |