diff options
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 40 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/RestObjectPoster.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/RestObjectPosterResponse.cs | 3 |
3 files changed, 26 insertions, 20 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index c73d45c..b73340c 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Communications | |||
255 | folder.agentID = user; | 255 | folder.agentID = user; |
256 | folder.folderID = LLUUID.Random(); | 256 | folder.folderID = LLUUID.Random(); |
257 | folder.name = "My Inventory"; | 257 | folder.name = "My Inventory"; |
258 | folder.type = 8; | 258 | folder.type = (short)AssetType.Folder; |
259 | folder.version = 1; | 259 | folder.version = 1; |
260 | Folders.Add(folder.folderID, folder); | 260 | Folders.Add(folder.folderID, folder); |
261 | 261 | ||
@@ -265,8 +265,8 @@ namespace OpenSim.Framework.Communications | |||
265 | folder.parentID = rootFolder; | 265 | folder.parentID = rootFolder; |
266 | folder.agentID = user; | 266 | folder.agentID = user; |
267 | folder.folderID = LLUUID.Random(); | 267 | folder.folderID = LLUUID.Random(); |
268 | folder.name = "Accessories"; | 268 | folder.name = "Animations"; |
269 | folder.type = 8; | 269 | folder.type = (short)AssetType.Animation; |
270 | folder.version = 1; | 270 | folder.version = 1; |
271 | Folders.Add(folder.folderID, folder); | 271 | Folders.Add(folder.folderID, folder); |
272 | 272 | ||
@@ -274,26 +274,26 @@ namespace OpenSim.Framework.Communications | |||
274 | folder.parentID = rootFolder; | 274 | folder.parentID = rootFolder; |
275 | folder.agentID = user; | 275 | folder.agentID = user; |
276 | folder.folderID = LLUUID.Random(); | 276 | folder.folderID = LLUUID.Random(); |
277 | folder.name = "Animations"; | 277 | folder.name = "Body Parts"; |
278 | folder.type = 20; | 278 | folder.type = (short)AssetType.Bodypart; |
279 | folder.version = 1; | 279 | folder.version = 1; |
280 | Folders.Add(folder.folderID, folder); | 280 | Folders.Add(folder.folderID, folder); |
281 | 281 | ||
282 | folder = new InventoryFolderBase(); | 282 | folder = new InventoryFolderBase(); |
283 | folder.parentID = rootFolder; | 283 | folder.parentID = rootFolder; |
284 | folder.agentID = user; | 284 | folder.agentID = user; |
285 | folder.folderID = LLUUID.Random(); | 285 | folder.folderID = LLUUID.Random(); |
286 | folder.name = "BodyParts"; | 286 | folder.name = "Calling Cards"; |
287 | folder.type = 13; | 287 | folder.type = (short)AssetType.CallingCard; |
288 | folder.version = 1; | 288 | folder.version = 1; |
289 | Folders.Add(folder.folderID, folder); | 289 | Folders.Add(folder.folderID, folder); |
290 | 290 | ||
291 | folder = new InventoryFolderBase(); | 291 | folder = new InventoryFolderBase(); |
292 | folder.parentID = rootFolder; | 292 | folder.parentID = rootFolder; |
293 | folder.agentID = user; | 293 | folder.agentID = user; |
294 | folder.folderID = LLUUID.Random(); | 294 | folder.folderID = LLUUID.Random(); |
295 | folder.name = "Clothing"; | 295 | folder.name = "Clothing"; |
296 | folder.type = 5; | 296 | folder.type = (short)AssetType.Clothing; |
297 | folder.version = 1; | 297 | folder.version = 1; |
298 | Folders.Add(folder.folderID, folder); | 298 | Folders.Add(folder.folderID, folder); |
299 | 299 | ||
@@ -302,7 +302,7 @@ namespace OpenSim.Framework.Communications | |||
302 | folder.agentID = user; | 302 | folder.agentID = user; |
303 | folder.folderID = LLUUID.Random(); | 303 | folder.folderID = LLUUID.Random(); |
304 | folder.name = "Gestures"; | 304 | folder.name = "Gestures"; |
305 | folder.type = 21; | 305 | folder.type = (short)AssetType.Gesture; |
306 | folder.version = 1; | 306 | folder.version = 1; |
307 | Folders.Add(folder.folderID, folder); | 307 | Folders.Add(folder.folderID, folder); |
308 | 308 | ||
@@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications | |||
311 | folder.agentID = user; | 311 | folder.agentID = user; |
312 | folder.folderID = LLUUID.Random(); | 312 | folder.folderID = LLUUID.Random(); |
313 | folder.name = "Landmarks"; | 313 | folder.name = "Landmarks"; |
314 | folder.type = 3; | 314 | folder.type = (short)AssetType.Landmark; |
315 | folder.version = 1; | 315 | folder.version = 1; |
316 | Folders.Add(folder.folderID, folder); | 316 | Folders.Add(folder.folderID, folder); |
317 | 317 | ||
@@ -320,7 +320,7 @@ namespace OpenSim.Framework.Communications | |||
320 | folder.agentID = user; | 320 | folder.agentID = user; |
321 | folder.folderID = LLUUID.Random(); | 321 | folder.folderID = LLUUID.Random(); |
322 | folder.name = "Lost And Found"; | 322 | folder.name = "Lost And Found"; |
323 | folder.type = 3; | 323 | folder.type = (short)AssetType.LostAndFoundFolder; |
324 | folder.version = 1; | 324 | folder.version = 1; |
325 | Folders.Add(folder.folderID, folder); | 325 | Folders.Add(folder.folderID, folder); |
326 | 326 | ||
@@ -329,7 +329,7 @@ namespace OpenSim.Framework.Communications | |||
329 | folder.agentID = user; | 329 | folder.agentID = user; |
330 | folder.folderID = LLUUID.Random(); | 330 | folder.folderID = LLUUID.Random(); |
331 | folder.name = "Notecards"; | 331 | folder.name = "Notecards"; |
332 | folder.type = 7; | 332 | folder.type = (short)AssetType.Notecard; |
333 | folder.version = 1; | 333 | folder.version = 1; |
334 | Folders.Add(folder.folderID, folder); | 334 | Folders.Add(folder.folderID, folder); |
335 | 335 | ||
@@ -338,7 +338,7 @@ namespace OpenSim.Framework.Communications | |||
338 | folder.agentID = user; | 338 | folder.agentID = user; |
339 | folder.folderID = LLUUID.Random(); | 339 | folder.folderID = LLUUID.Random(); |
340 | folder.name = "Objects"; | 340 | folder.name = "Objects"; |
341 | folder.type = 6; | 341 | folder.type = (short)AssetType.Primitive; |
342 | folder.version = 1; | 342 | folder.version = 1; |
343 | Folders.Add(folder.folderID, folder); | 343 | Folders.Add(folder.folderID, folder); |
344 | 344 | ||
@@ -347,7 +347,7 @@ namespace OpenSim.Framework.Communications | |||
347 | folder.agentID = user; | 347 | folder.agentID = user; |
348 | folder.folderID = LLUUID.Random(); | 348 | folder.folderID = LLUUID.Random(); |
349 | folder.name = "Photo Album"; | 349 | folder.name = "Photo Album"; |
350 | folder.type = 15; | 350 | folder.type = (short)AssetType.SnapshotFolder; |
351 | folder.version = 1; | 351 | folder.version = 1; |
352 | Folders.Add(folder.folderID, folder); | 352 | Folders.Add(folder.folderID, folder); |
353 | 353 | ||
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Communications | |||
356 | folder.agentID = user; | 356 | folder.agentID = user; |
357 | folder.folderID = LLUUID.Random(); | 357 | folder.folderID = LLUUID.Random(); |
358 | folder.name = "Scripts"; | 358 | folder.name = "Scripts"; |
359 | folder.type = 10; | 359 | folder.type = (short)AssetType.LSLText; |
360 | folder.version = 1; | 360 | folder.version = 1; |
361 | Folders.Add(folder.folderID, folder); | 361 | Folders.Add(folder.folderID, folder); |
362 | 362 | ||
@@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications | |||
365 | folder.agentID = user; | 365 | folder.agentID = user; |
366 | folder.folderID = LLUUID.Random(); | 366 | folder.folderID = LLUUID.Random(); |
367 | folder.name = "Sounds"; | 367 | folder.name = "Sounds"; |
368 | folder.type = 1; | 368 | folder.type = (short)AssetType.Sound; |
369 | folder.version = 1; | 369 | folder.version = 1; |
370 | Folders.Add(folder.folderID, folder); | 370 | Folders.Add(folder.folderID, folder); |
371 | 371 | ||
@@ -374,7 +374,7 @@ namespace OpenSim.Framework.Communications | |||
374 | folder.agentID = user; | 374 | folder.agentID = user; |
375 | folder.folderID = LLUUID.Random(); | 375 | folder.folderID = LLUUID.Random(); |
376 | folder.name = "Textures"; | 376 | folder.name = "Textures"; |
377 | folder.type = 0; | 377 | folder.type = (short)AssetType.Texture; |
378 | folder.version = 1; | 378 | folder.version = 1; |
379 | Folders.Add(folder.folderID, folder); | 379 | Folders.Add(folder.folderID, folder); |
380 | 380 | ||
@@ -383,7 +383,7 @@ namespace OpenSim.Framework.Communications | |||
383 | folder.agentID = user; | 383 | folder.agentID = user; |
384 | folder.folderID = LLUUID.Random(); | 384 | folder.folderID = LLUUID.Random(); |
385 | folder.name = "Trash"; | 385 | folder.name = "Trash"; |
386 | folder.type = 14; | 386 | folder.type = (short)AssetType.TrashFolder; |
387 | folder.version = 1; | 387 | folder.version = 1; |
388 | Folders.Add(folder.folderID, folder); | 388 | Folders.Add(folder.folderID, folder); |
389 | } | 389 | } |
diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs index 8cc1154..c77cb26 100644 --- a/OpenSim/Framework/Servers/RestObjectPoster.cs +++ b/OpenSim/Framework/Servers/RestObjectPoster.cs | |||
@@ -34,6 +34,9 @@ using System.Xml.Serialization; | |||
34 | 34 | ||
35 | namespace OpenSim.Framework.Servers | 35 | namespace OpenSim.Framework.Servers |
36 | { | 36 | { |
37 | /// <summary> | ||
38 | /// Makes an asynchronous REST request which doesn't require us to do anything with the response. | ||
39 | /// </summary> | ||
37 | public class RestObjectPoster | 40 | public class RestObjectPoster |
38 | { | 41 | { |
39 | public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj) | 42 | public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj) |
diff --git a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs index e2479dd..1d99a80 100644 --- a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs +++ b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs | |||
@@ -36,6 +36,9 @@ namespace OpenSim.Framework.Servers | |||
36 | { | 36 | { |
37 | public delegate void ReturnResponse<T>(T reponse); | 37 | public delegate void ReturnResponse<T>(T reponse); |
38 | 38 | ||
39 | /// <summary> | ||
40 | /// Makes an asynchronous REST request with a callback to invoke with the response. | ||
41 | /// </summary> | ||
39 | public class RestObjectPosterResponse<TResponse> | 42 | public class RestObjectPosterResponse<TResponse> |
40 | { | 43 | { |
41 | public ReturnResponse<TResponse> ResponseCallback; | 44 | public ReturnResponse<TResponse> ResponseCallback; |