aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs32
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index 26521ab..c690def 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using 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 OGS1SecureInventoryService(string inventoryServerUrl) 52 public OGS1SecureInventoryService(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, LLUUID session_id, InventoryReceiptCallback callback) 70 public void RequestInventoryForUser(UUID userID, UUID session_id, 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 RestSessionObjectPosterResponse<Guid, InventoryCollection>(); 83 = new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
84 requester.ResponseCallback = InventoryResponse; 84 requester.ResponseCallback = InventoryResponse;
85 85
86 requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID, session_id.ToString(), userID.ToString()); 86 requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
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);
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
166 /// <summary> 166 /// <summary>
167 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 167 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
168 /// </summary> 168 /// </summary>
169 public bool AddFolder(InventoryFolderBase folder, LLUUID session_id) 169 public bool AddFolder(InventoryFolderBase folder, UUID session_id)
170 { 170 {
171 try 171 try
172 { 172 {
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Communications.OGS1
186 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 186 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
187 /// </summary> 187 /// </summary>
188 /// <param name="folder"></param> 188 /// <param name="folder"></param>
189 public bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id) 189 public bool UpdateFolder(InventoryFolderBase folder, UUID session_id)
190 { 190 {
191 try 191 try
192 { 192 {
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Communications.OGS1
206 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 206 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
207 /// </summary> 207 /// </summary>
208 /// <param name="folder"></param> 208 /// <param name="folder"></param>
209 public bool MoveFolder(InventoryFolderBase folder, LLUUID session_id) 209 public bool MoveFolder(InventoryFolderBase folder, UUID session_id)
210 { 210 {
211 try 211 try
212 { 212 {
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Communications.OGS1
225 /// <summary> 225 /// <summary>
226 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 226 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
227 /// </summary> 227 /// </summary>
228 public bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id) 228 public bool PurgeFolder(InventoryFolderBase folder, UUID session_id)
229 { 229 {
230 try 230 try
231 { 231 {
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Communications.OGS1
244 /// <summary> 244 /// <summary>
245 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 245 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
246 /// </summary> 246 /// </summary>
247 public bool AddItem(InventoryItemBase item, LLUUID session_id) 247 public bool AddItem(InventoryItemBase item, UUID session_id)
248 { 248 {
249 try 249 try
250 { 250 {
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Communications.OGS1
261 } 261 }
262 262
263 // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented 263 // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented
264 public bool UpdateItem(InventoryItemBase item, LLUUID session_id) 264 public bool UpdateItem(InventoryItemBase item, UUID session_id)
265 { 265 {
266 try 266 try
267 { 267 {
@@ -280,7 +280,7 @@ namespace OpenSim.Region.Communications.OGS1
280 /// <summary> 280 /// <summary>
281 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 281 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
282 /// </summary> 282 /// </summary>
283 public bool DeleteItem(InventoryItemBase item, LLUUID session_id) 283 public bool DeleteItem(InventoryItemBase item, UUID session_id)
284 { 284 {
285 try 285 try
286 { 286 {
@@ -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 }