diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 2828928..b9e8394 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
@@ -46,8 +46,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
46 | 46 | ||
47 | private string _inventoryServerUrl; | 47 | private string _inventoryServerUrl; |
48 | private Uri m_Uri; | 48 | private Uri m_Uri; |
49 | private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory | 49 | private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory |
50 | = new Dictionary<LLUUID, InventoryReceiptCallback>(); | 50 | = new Dictionary<UUID, InventoryReceiptCallback>(); |
51 | 51 | ||
52 | public OGS1InventoryService(string inventoryServerUrl) | 52 | public OGS1InventoryService(string inventoryServerUrl) |
53 | { | 53 | { |
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
67 | /// </summary> | 67 | /// </summary> |
68 | /// <param name="userID"></param> | 68 | /// <param name="userID"></param> |
69 | /// <param name="callback"></param> | 69 | /// <param name="callback"></param> |
70 | public void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 70 | public void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) |
71 | { | 71 | { |
72 | if (!m_RequestingInventory.ContainsKey(userID)) | 72 | if (!m_RequestingInventory.ContainsKey(userID)) |
73 | { | 73 | { |
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
83 | = new RestObjectPosterResponse<InventoryCollection>(); | 83 | = new RestObjectPosterResponse<InventoryCollection>(); |
84 | requester.ResponseCallback = InventoryResponse; | 84 | requester.ResponseCallback = InventoryResponse; |
85 | 85 | ||
86 | requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); | 86 | requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.Guid); |
87 | } | 87 | } |
88 | catch (WebException e) | 88 | catch (WebException e) |
89 | { | 89 | { |
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
106 | /// <param name="userID"></param> | 106 | /// <param name="userID"></param> |
107 | private void InventoryResponse(InventoryCollection response) | 107 | private void InventoryResponse(InventoryCollection response) |
108 | { | 108 | { |
109 | LLUUID userID = response.UserID; | 109 | UUID userID = response.UserID; |
110 | if (m_RequestingInventory.ContainsKey(userID)) | 110 | if (m_RequestingInventory.ContainsKey(userID)) |
111 | { | 111 | { |
112 | m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + | 112 | m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
121 | 121 | ||
122 | foreach (InventoryFolderBase folder in response.Folders) | 122 | foreach (InventoryFolderBase folder in response.Folders) |
123 | { | 123 | { |
124 | if (folder.ParentID == LLUUID.Zero) | 124 | if (folder.ParentID == UUID.Zero) |
125 | { | 125 | { |
126 | rootFolder = new InventoryFolderImpl(folder); | 126 | rootFolder = new InventoryFolderImpl(folder); |
127 | folders.Add(rootFolder); | 127 | folders.Add(rootFolder); |
@@ -296,12 +296,12 @@ namespace OpenSim.Region.Communications.OGS1 | |||
296 | return false; | 296 | return false; |
297 | } | 297 | } |
298 | 298 | ||
299 | public bool HasInventoryForUser(LLUUID userID) | 299 | public bool HasInventoryForUser(UUID userID) |
300 | { | 300 | { |
301 | return false; | 301 | return false; |
302 | } | 302 | } |
303 | 303 | ||
304 | public InventoryFolderBase RequestRootFolder(LLUUID userID) | 304 | public InventoryFolderBase RequestRootFolder(UUID userID) |
305 | { | 305 | { |
306 | return null; | 306 | return null; |
307 | } | 307 | } |