diff options
Diffstat (limited to 'OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs')
-rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs index 2c91328..b67b326 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs | |||
@@ -25,20 +25,12 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | using log4net; | ||
33 | using Nini.Config; | ||
34 | using OpenMetaverse; | 28 | using OpenMetaverse; |
35 | using OpenMetaverse.StructuredData; | 29 | using OpenMetaverse.StructuredData; |
36 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Capabilities; | 31 | using OpenSim.Framework.Capabilities; |
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Framework.Servers.HttpServer; | 32 | using OpenSim.Framework.Servers.HttpServer; |
40 | using OpenSim.Services.Interfaces; | 33 | using OpenSim.Services.Interfaces; |
41 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
42 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | 34 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; |
43 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 35 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
44 | 36 | ||
@@ -49,10 +41,12 @@ namespace OpenSim.Capabilities.Handlers | |||
49 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 42 | ||
51 | private IInventoryService m_inventoryService; | 43 | private IInventoryService m_inventoryService; |
44 | private UUID m_agentID; | ||
52 | 45 | ||
53 | public FetchInventory2Handler(IInventoryService invService) | 46 | public FetchInventory2Handler(IInventoryService invService, UUID agentId) |
54 | { | 47 | { |
55 | m_inventoryService = invService; | 48 | m_inventoryService = invService; |
49 | m_agentID = agentId; | ||
56 | } | 50 | } |
57 | 51 | ||
58 | public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 52 | public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
@@ -69,7 +63,7 @@ namespace OpenSim.Capabilities.Handlers | |||
69 | { | 63 | { |
70 | UUID itemId = osdItemId["item_id"].AsUUID(); | 64 | UUID itemId = osdItemId["item_id"].AsUUID(); |
71 | 65 | ||
72 | InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId)); | 66 | InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId, m_agentID)); |
73 | 67 | ||
74 | if (item != null) | 68 | if (item != null) |
75 | { | 69 | { |