diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 0fb083a..0d97074 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -29,10 +29,10 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Servers; | ||
33 | using OpenSim.Framework.Communications; | 32 | using OpenSim.Framework.Communications; |
34 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Servers; | ||
36 | 36 | ||
37 | namespace OpenSim.Region.Communications.OGS1 | 37 | namespace OpenSim.Region.Communications.OGS1 |
38 | { | 38 | { |
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
51 | // See IInventoryServices | 51 | // See IInventoryServices |
52 | public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 52 | public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
53 | InventoryItemInfo itemCallBack) | 53 | InventoryItemInfo itemCallBack) |
54 | { | 54 | { |
55 | if (!m_RequestingInventory.ContainsKey(userID)) | 55 | if (!m_RequestingInventory.ContainsKey(userID)) |
56 | { | 56 | { |
57 | InventoryRequest request = new InventoryRequest(userID, folderCallBack, itemCallBack); | 57 | InventoryRequest request = new InventoryRequest(userID, folderCallBack, itemCallBack); |
@@ -72,10 +72,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
72 | try | 72 | try |
73 | { | 73 | { |
74 | MainLog.Instance.Verbose( | 74 | MainLog.Instance.Verbose( |
75 | "INVENTORY", "Requesting inventory from {0}/GetInventory/ for user {1}", | 75 | "INVENTORY", "Requesting inventory from {0}/GetInventory/ for user {1}", |
76 | _inventoryServerUrl, userID); | 76 | _inventoryServerUrl, userID); |
77 | 77 | ||
78 | RestObjectPosterResponse<InventoryCollection> requester | 78 | RestObjectPosterResponse<InventoryCollection> requester |
79 | = new RestObjectPosterResponse<InventoryCollection>(); | 79 | = new RestObjectPosterResponse<InventoryCollection>(); |
80 | requester.ResponseCallback = InventoryResponse; | 80 | requester.ResponseCallback = InventoryResponse; |
81 | 81 | ||
@@ -96,10 +96,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
96 | LLUUID userID = response.UserID; | 96 | LLUUID userID = response.UserID; |
97 | if (m_RequestingInventory.ContainsKey(userID)) | 97 | if (m_RequestingInventory.ContainsKey(userID)) |
98 | { | 98 | { |
99 | MainLog.Instance.Verbose("INVENTORY", | 99 | MainLog.Instance.Verbose("INVENTORY", |
100 | "Received inventory response for user {0} containing {1} folders and {2} items", | 100 | "Received inventory response for user {0} containing {1} folders and {2} items", |
101 | userID, response.Folders.Count, response.AllItems.Count); | 101 | userID, response.Folders.Count, response.AllItems.Count); |
102 | 102 | ||
103 | InventoryFolderImpl rootFolder = null; | 103 | InventoryFolderImpl rootFolder = null; |
104 | InventoryRequest request = m_RequestingInventory[userID]; | 104 | InventoryRequest request = m_RequestingInventory[userID]; |
105 | foreach (InventoryFolderBase folder in response.Folders) | 105 | foreach (InventoryFolderBase folder in response.Folders) |
@@ -133,8 +133,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
133 | else | 133 | else |
134 | { | 134 | { |
135 | MainLog.Instance.Warn( | 135 | MainLog.Instance.Warn( |
136 | "INVENTORY", | 136 | "INVENTORY", |
137 | "Received inventory response for {0} for which we do not have a record of requesting!", | 137 | "Received inventory response for {0} for which we do not have a record of requesting!", |
138 | userID); | 138 | userID); |
139 | } | 139 | } |
140 | } | 140 | } |
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
150 | SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( | 150 | SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( |
151 | "POST", _inventoryServerUrl + "/MoveFolder/", folder); | 151 | "POST", _inventoryServerUrl + "/MoveFolder/", folder); |
152 | } | 152 | } |
153 | 153 | ||
154 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) | 154 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) |
155 | { | 155 | { |
156 | SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( | 156 | SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>( |
@@ -188,4 +188,4 @@ namespace OpenSim.Region.Communications.OGS1 | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | } | 190 | } |
191 | } | 191 | } \ No newline at end of file |