diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/InventoryServiceBase.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index c76c078..3239268 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | 32 | ||
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | 35 | ||
36 | namespace OpenSim.Framework.Communications | 36 | namespace OpenSim.Framework.Communications |
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications | |||
57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); | 57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); |
58 | 58 | ||
59 | // loader will try to load all providers (MySQL, MSSQL, etc) | 59 | // loader will try to load all providers (MySQL, MSSQL, etc) |
60 | // unless it is constrainted to the correct "Provider" entry in the addin.xml | 60 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml |
61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); | 61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); |
62 | loader.Load(); | 62 | loader.Load(); |
63 | 63 | ||
@@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications | |||
74 | } | 74 | } |
75 | 75 | ||
76 | // See IInventoryServices | 76 | // See IInventoryServices |
77 | public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) | 77 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) |
78 | { | 78 | { |
79 | // m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); | 79 | // m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); |
80 | 80 | ||
@@ -105,13 +105,13 @@ namespace OpenSim.Framework.Communications | |||
105 | } | 105 | } |
106 | 106 | ||
107 | // See IInventoryServices | 107 | // See IInventoryServices |
108 | public virtual bool HasInventoryForUser(LLUUID userID) | 108 | public virtual bool HasInventoryForUser(UUID userID) |
109 | { | 109 | { |
110 | return false; | 110 | return false; |
111 | } | 111 | } |
112 | 112 | ||
113 | // See IInventoryServices | 113 | // See IInventoryServices |
114 | public InventoryFolderBase RequestRootFolder(LLUUID userID) | 114 | public InventoryFolderBase RequestRootFolder(UUID userID) |
115 | { | 115 | { |
116 | // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin | 116 | // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin |
117 | foreach (IInventoryDataPlugin plugin in m_plugins) | 117 | foreach (IInventoryDataPlugin plugin in m_plugins) |
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Communications | |||
122 | } | 122 | } |
123 | 123 | ||
124 | // See IInventoryServices | 124 | // See IInventoryServices |
125 | public bool CreateNewUserInventory(LLUUID user) | 125 | public bool CreateNewUserInventory(UUID user) |
126 | { | 126 | { |
127 | InventoryFolderBase existingRootFolder = RequestRootFolder(user); | 127 | InventoryFolderBase existingRootFolder = RequestRootFolder(user); |
128 | 128 | ||
@@ -146,13 +146,13 @@ namespace OpenSim.Framework.Communications | |||
146 | } | 146 | } |
147 | 147 | ||
148 | // See IInventoryServices | 148 | // See IInventoryServices |
149 | public abstract void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback); | 149 | public abstract void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback); |
150 | 150 | ||
151 | #endregion | 151 | #endregion |
152 | 152 | ||
153 | #region Methods used by GridInventoryService | 153 | #region Methods used by GridInventoryService |
154 | 154 | ||
155 | public List<InventoryFolderBase> RequestSubFolders(LLUUID parentFolderID) | 155 | public List<InventoryFolderBase> RequestSubFolders(UUID parentFolderID) |
156 | { | 156 | { |
157 | List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); | 157 | List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); |
158 | foreach (IInventoryDataPlugin plugin in m_plugins) | 158 | foreach (IInventoryDataPlugin plugin in m_plugins) |
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications | |||
162 | return inventoryList; | 162 | return inventoryList; |
163 | } | 163 | } |
164 | 164 | ||
165 | public List<InventoryItemBase> RequestFolderItems(LLUUID folderID) | 165 | public List<InventoryItemBase> RequestFolderItems(UUID folderID) |
166 | { | 166 | { |
167 | List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); | 167 | List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); |
168 | foreach (IInventoryDataPlugin plugin in m_plugins) | 168 | foreach (IInventoryDataPlugin plugin in m_plugins) |
@@ -313,27 +313,27 @@ namespace OpenSim.Framework.Communications | |||
313 | /// </summary> | 313 | /// </summary> |
314 | private class UsersInventory | 314 | private class UsersInventory |
315 | { | 315 | { |
316 | public Dictionary<LLUUID, InventoryFolderBase> Folders = new Dictionary<LLUUID, InventoryFolderBase>(); | 316 | public Dictionary<UUID, InventoryFolderBase> Folders = new Dictionary<UUID, InventoryFolderBase>(); |
317 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 317 | public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>(); |
318 | 318 | ||
319 | public virtual void CreateNewInventorySet(LLUUID user) | 319 | public virtual void CreateNewInventorySet(UUID user) |
320 | { | 320 | { |
321 | InventoryFolderBase folder = new InventoryFolderBase(); | 321 | InventoryFolderBase folder = new InventoryFolderBase(); |
322 | 322 | ||
323 | folder.ParentID = LLUUID.Zero; | 323 | folder.ParentID = UUID.Zero; |
324 | folder.Owner = user; | 324 | folder.Owner = user; |
325 | folder.ID = LLUUID.Random(); | 325 | folder.ID = UUID.Random(); |
326 | folder.Name = "My Inventory"; | 326 | folder.Name = "My Inventory"; |
327 | folder.Type = (short)AssetType.Folder; | 327 | folder.Type = (short)AssetType.Folder; |
328 | folder.Version = 1; | 328 | folder.Version = 1; |
329 | Folders.Add(folder.ID, folder); | 329 | Folders.Add(folder.ID, folder); |
330 | 330 | ||
331 | LLUUID rootFolder = folder.ID; | 331 | UUID rootFolder = folder.ID; |
332 | 332 | ||
333 | folder = new InventoryFolderBase(); | 333 | folder = new InventoryFolderBase(); |
334 | folder.ParentID = rootFolder; | 334 | folder.ParentID = rootFolder; |
335 | folder.Owner = user; | 335 | folder.Owner = user; |
336 | folder.ID = LLUUID.Random(); | 336 | folder.ID = UUID.Random(); |
337 | folder.Name = "Animations"; | 337 | folder.Name = "Animations"; |
338 | folder.Type = (short)AssetType.Animation; | 338 | folder.Type = (short)AssetType.Animation; |
339 | folder.Version = 1; | 339 | folder.Version = 1; |
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.Communications | |||
342 | folder = new InventoryFolderBase(); | 342 | folder = new InventoryFolderBase(); |
343 | folder.ParentID = rootFolder; | 343 | folder.ParentID = rootFolder; |
344 | folder.Owner = user; | 344 | folder.Owner = user; |
345 | folder.ID = LLUUID.Random(); | 345 | folder.ID = UUID.Random(); |
346 | folder.Name = "Body Parts"; | 346 | folder.Name = "Body Parts"; |
347 | folder.Type = (short)AssetType.Bodypart; | 347 | folder.Type = (short)AssetType.Bodypart; |
348 | folder.Version = 1; | 348 | folder.Version = 1; |
@@ -351,7 +351,7 @@ namespace OpenSim.Framework.Communications | |||
351 | folder = new InventoryFolderBase(); | 351 | folder = new InventoryFolderBase(); |
352 | folder.ParentID = rootFolder; | 352 | folder.ParentID = rootFolder; |
353 | folder.Owner = user; | 353 | folder.Owner = user; |
354 | folder.ID = LLUUID.Random(); | 354 | folder.ID = UUID.Random(); |
355 | folder.Name = "Calling Cards"; | 355 | folder.Name = "Calling Cards"; |
356 | folder.Type = (short)AssetType.CallingCard; | 356 | folder.Type = (short)AssetType.CallingCard; |
357 | folder.Version = 1; | 357 | folder.Version = 1; |
@@ -360,7 +360,7 @@ namespace OpenSim.Framework.Communications | |||
360 | folder = new InventoryFolderBase(); | 360 | folder = new InventoryFolderBase(); |
361 | folder.ParentID = rootFolder; | 361 | folder.ParentID = rootFolder; |
362 | folder.Owner = user; | 362 | folder.Owner = user; |
363 | folder.ID = LLUUID.Random(); | 363 | folder.ID = UUID.Random(); |
364 | folder.Name = "Clothing"; | 364 | folder.Name = "Clothing"; |
365 | folder.Type = (short)AssetType.Clothing; | 365 | folder.Type = (short)AssetType.Clothing; |
366 | folder.Version = 1; | 366 | folder.Version = 1; |
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Communications | |||
369 | folder = new InventoryFolderBase(); | 369 | folder = new InventoryFolderBase(); |
370 | folder.ParentID = rootFolder; | 370 | folder.ParentID = rootFolder; |
371 | folder.Owner = user; | 371 | folder.Owner = user; |
372 | folder.ID = LLUUID.Random(); | 372 | folder.ID = UUID.Random(); |
373 | folder.Name = "Gestures"; | 373 | folder.Name = "Gestures"; |
374 | folder.Type = (short)AssetType.Gesture; | 374 | folder.Type = (short)AssetType.Gesture; |
375 | folder.Version = 1; | 375 | folder.Version = 1; |
@@ -378,7 +378,7 @@ namespace OpenSim.Framework.Communications | |||
378 | folder = new InventoryFolderBase(); | 378 | folder = new InventoryFolderBase(); |
379 | folder.ParentID = rootFolder; | 379 | folder.ParentID = rootFolder; |
380 | folder.Owner = user; | 380 | folder.Owner = user; |
381 | folder.ID = LLUUID.Random(); | 381 | folder.ID = UUID.Random(); |
382 | folder.Name = "Landmarks"; | 382 | folder.Name = "Landmarks"; |
383 | folder.Type = (short)AssetType.Landmark; | 383 | folder.Type = (short)AssetType.Landmark; |
384 | folder.Version = 1; | 384 | folder.Version = 1; |
@@ -387,7 +387,7 @@ namespace OpenSim.Framework.Communications | |||
387 | folder = new InventoryFolderBase(); | 387 | folder = new InventoryFolderBase(); |
388 | folder.ParentID = rootFolder; | 388 | folder.ParentID = rootFolder; |
389 | folder.Owner = user; | 389 | folder.Owner = user; |
390 | folder.ID = LLUUID.Random(); | 390 | folder.ID = UUID.Random(); |
391 | folder.Name = "Lost And Found"; | 391 | folder.Name = "Lost And Found"; |
392 | folder.Type = (short)AssetType.LostAndFoundFolder; | 392 | folder.Type = (short)AssetType.LostAndFoundFolder; |
393 | folder.Version = 1; | 393 | folder.Version = 1; |
@@ -396,7 +396,7 @@ namespace OpenSim.Framework.Communications | |||
396 | folder = new InventoryFolderBase(); | 396 | folder = new InventoryFolderBase(); |
397 | folder.ParentID = rootFolder; | 397 | folder.ParentID = rootFolder; |
398 | folder.Owner = user; | 398 | folder.Owner = user; |
399 | folder.ID = LLUUID.Random(); | 399 | folder.ID = UUID.Random(); |
400 | folder.Name = "Notecards"; | 400 | folder.Name = "Notecards"; |
401 | folder.Type = (short)AssetType.Notecard; | 401 | folder.Type = (short)AssetType.Notecard; |
402 | folder.Version = 1; | 402 | folder.Version = 1; |
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Communications | |||
405 | folder = new InventoryFolderBase(); | 405 | folder = new InventoryFolderBase(); |
406 | folder.ParentID = rootFolder; | 406 | folder.ParentID = rootFolder; |
407 | folder.Owner = user; | 407 | folder.Owner = user; |
408 | folder.ID = LLUUID.Random(); | 408 | folder.ID = UUID.Random(); |
409 | folder.Name = "Objects"; | 409 | folder.Name = "Objects"; |
410 | folder.Type = (short)AssetType.Object; | 410 | folder.Type = (short)AssetType.Object; |
411 | folder.Version = 1; | 411 | folder.Version = 1; |
@@ -414,7 +414,7 @@ namespace OpenSim.Framework.Communications | |||
414 | folder = new InventoryFolderBase(); | 414 | folder = new InventoryFolderBase(); |
415 | folder.ParentID = rootFolder; | 415 | folder.ParentID = rootFolder; |
416 | folder.Owner = user; | 416 | folder.Owner = user; |
417 | folder.ID = LLUUID.Random(); | 417 | folder.ID = UUID.Random(); |
418 | folder.Name = "Photo Album"; | 418 | folder.Name = "Photo Album"; |
419 | folder.Type = (short)AssetType.SnapshotFolder; | 419 | folder.Type = (short)AssetType.SnapshotFolder; |
420 | folder.Version = 1; | 420 | folder.Version = 1; |
@@ -423,7 +423,7 @@ namespace OpenSim.Framework.Communications | |||
423 | folder = new InventoryFolderBase(); | 423 | folder = new InventoryFolderBase(); |
424 | folder.ParentID = rootFolder; | 424 | folder.ParentID = rootFolder; |
425 | folder.Owner = user; | 425 | folder.Owner = user; |
426 | folder.ID = LLUUID.Random(); | 426 | folder.ID = UUID.Random(); |
427 | folder.Name = "Scripts"; | 427 | folder.Name = "Scripts"; |
428 | folder.Type = (short)AssetType.LSLText; | 428 | folder.Type = (short)AssetType.LSLText; |
429 | folder.Version = 1; | 429 | folder.Version = 1; |
@@ -432,7 +432,7 @@ namespace OpenSim.Framework.Communications | |||
432 | folder = new InventoryFolderBase(); | 432 | folder = new InventoryFolderBase(); |
433 | folder.ParentID = rootFolder; | 433 | folder.ParentID = rootFolder; |
434 | folder.Owner = user; | 434 | folder.Owner = user; |
435 | folder.ID = LLUUID.Random(); | 435 | folder.ID = UUID.Random(); |
436 | folder.Name = "Sounds"; | 436 | folder.Name = "Sounds"; |
437 | folder.Type = (short)AssetType.Sound; | 437 | folder.Type = (short)AssetType.Sound; |
438 | folder.Version = 1; | 438 | folder.Version = 1; |
@@ -441,7 +441,7 @@ namespace OpenSim.Framework.Communications | |||
441 | folder = new InventoryFolderBase(); | 441 | folder = new InventoryFolderBase(); |
442 | folder.ParentID = rootFolder; | 442 | folder.ParentID = rootFolder; |
443 | folder.Owner = user; | 443 | folder.Owner = user; |
444 | folder.ID = LLUUID.Random(); | 444 | folder.ID = UUID.Random(); |
445 | folder.Name = "Textures"; | 445 | folder.Name = "Textures"; |
446 | folder.Type = (short)AssetType.Texture; | 446 | folder.Type = (short)AssetType.Texture; |
447 | folder.Version = 1; | 447 | folder.Version = 1; |
@@ -450,7 +450,7 @@ namespace OpenSim.Framework.Communications | |||
450 | folder = new InventoryFolderBase(); | 450 | folder = new InventoryFolderBase(); |
451 | folder.ParentID = rootFolder; | 451 | folder.ParentID = rootFolder; |
452 | folder.Owner = user; | 452 | folder.Owner = user; |
453 | folder.ID = LLUUID.Random(); | 453 | folder.ID = UUID.Random(); |
454 | folder.Name = "Trash"; | 454 | folder.Name = "Trash"; |
455 | folder.Type = (short)AssetType.TrashFolder; | 455 | folder.Type = (short)AssetType.TrashFolder; |
456 | folder.Version = 1; | 456 | folder.Version = 1; |