diff options
author | Justin Clarke Casey | 2008-07-31 18:32:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-31 18:32:57 +0000 |
commit | 6d15f25026ca6d19850cf4727ac8cc30667872e1 (patch) | |
tree | b38be6ba32290c516f42990824e35f31b79edcff /OpenSim/Region/Application | |
parent | * refactor: rearrange path inventory manipulation so that input tidying can b... (diff) | |
download | opensim-SC_OLD-6d15f25026ca6d19850cf4727ac8cc30667872e1.zip opensim-SC_OLD-6d15f25026ca6d19850cf4727ac8cc30667872e1.tar.gz opensim-SC_OLD-6d15f25026ca6d19850cf4727ac8cc30667872e1.tar.bz2 opensim-SC_OLD-6d15f25026ca6d19850cf4727ac8cc30667872e1.tar.xz |
* Allow an individual item to be specified as well as a folder in save-inv
* No user functionality yet (and not for some time)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 828abcb..c718c53 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -698,7 +698,7 @@ namespace OpenSim | |||
698 | } | 698 | } |
699 | 699 | ||
700 | InventoryFolderImpl inventoryFolder = null; | 700 | InventoryFolderImpl inventoryFolder = null; |
701 | //InventoryItemBase inventoryItem = null; | 701 | InventoryItemBase inventoryItem = null; |
702 | 702 | ||
703 | if (userInfo.HasReceivedInventory) | 703 | if (userInfo.HasReceivedInventory) |
704 | { | 704 | { |
@@ -725,10 +725,11 @@ namespace OpenSim | |||
725 | inventoryFolder = userInfo.RootFolder.FindFolderByPath(invPath); | 725 | inventoryFolder = userInfo.RootFolder.FindFolderByPath(invPath); |
726 | } | 726 | } |
727 | 727 | ||
728 | // if (inventoryFolder == null) | 728 | // The path may point to an item instead |
729 | // { | 729 | if (inventoryFolder == null) |
730 | // | 730 | { |
731 | // } | 731 | inventoryItem = userInfo.RootFolder.FindItemByPath(invPath); |
732 | } | ||
732 | } | 733 | } |
733 | else | 734 | else |
734 | { | 735 | { |
@@ -736,15 +737,19 @@ namespace OpenSim | |||
736 | return; | 737 | return; |
737 | } | 738 | } |
738 | 739 | ||
739 | if (null == inventoryFolder) | 740 | if (null != inventoryFolder) |
740 | { | 741 | { |
741 | m_log.ErrorFormat("[CONSOLE]: Could not find folder with path {0}", invPath); | 742 | m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, invPath); |
742 | return; | ||
743 | } | 743 | } |
744 | else | 744 | else if (null != inventoryItem) |
745 | { | 745 | { |
746 | m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, invPath); | 746 | m_log.InfoFormat("[CONSOLE]: Found item {0} {1} at {2}", inventoryItem.Name, inventoryItem.ID, invPath); |
747 | } | 747 | } |
748 | else | ||
749 | { | ||
750 | m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath); | ||
751 | return; | ||
752 | } | ||
748 | } | 753 | } |
749 | 754 | ||
750 | /// <summary> | 755 | /// <summary> |