diff options
author | Diva Canto | 2009-08-13 14:10:12 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-13 14:10:12 -0700 |
commit | 5246dc33dcfc51b7ebb19b269159df3991029350 (patch) | |
tree | af1a8fa9e0f6408b3280e0165080ac0d580597d9 /OpenSim | |
parent | Inventory redirects from CachedUserInfo to InventoryService COMPLETE! (diff) | |
download | opensim-SC-5246dc33dcfc51b7ebb19b269159df3991029350.zip opensim-SC-5246dc33dcfc51b7ebb19b269159df3991029350.tar.gz opensim-SC-5246dc33dcfc51b7ebb19b269159df3991029350.tar.bz2 opensim-SC-5246dc33dcfc51b7ebb19b269159df3991029350.tar.xz |
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
Diffstat (limited to '')
21 files changed, 70 insertions, 70 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 8ee1b1a..ca641d0 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -747,7 +747,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
747 | 747 | ||
748 | InventoryItemBase itemInfo = null; | 748 | InventoryItemBase itemInfo = null; |
749 | 749 | ||
750 | itemInfo = m_InventoryService.QueryItem(item); | 750 | itemInfo = m_InventoryService.GetItem(item); |
751 | 751 | ||
752 | if (itemInfo != null) | 752 | if (itemInfo != null) |
753 | { | 753 | { |
@@ -784,7 +784,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
784 | 784 | ||
785 | InventoryFolderBase folderInfo = null; | 785 | InventoryFolderBase folderInfo = null; |
786 | 786 | ||
787 | folderInfo = m_InventoryService.QueryFolder(folder); | 787 | folderInfo = m_InventoryService.GetFolder(folder); |
788 | 788 | ||
789 | if (folderInfo != null) | 789 | if (folderInfo != null) |
790 | { | 790 | { |
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index fe88cf5..670c9ff 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -186,14 +186,14 @@ namespace OpenSim.Framework.Communications.Tests | |||
186 | 186 | ||
187 | Assert.That( | 187 | Assert.That( |
188 | userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False); | 188 | userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False); |
189 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null); | 189 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); |
190 | Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False); | 190 | Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False); |
191 | Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null); | 191 | Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null); |
192 | 192 | ||
193 | // 2: Try a folder create that should work | 193 | // 2: Try a folder create that should work |
194 | Assert.That( | 194 | Assert.That( |
195 | userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True); | 195 | userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True); |
196 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null); | 196 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null); |
197 | Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True); | 197 | Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True); |
198 | } | 198 | } |
199 | 199 | ||
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
228 | Assert.That(newFolderName1, Is.EqualTo(folder1.Name)); | 228 | Assert.That(newFolderName1, Is.EqualTo(folder1.Name)); |
229 | Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type)); | 229 | Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type)); |
230 | 230 | ||
231 | InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder); | 231 | InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder); |
232 | Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name)); | 232 | Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name)); |
233 | Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type)); | 233 | Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type)); |
234 | } | 234 | } |
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
254 | Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True); | 254 | Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True); |
255 | Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False); | 255 | Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False); |
256 | 256 | ||
257 | InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder2); | 257 | InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder2); |
258 | Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name)); | 258 | Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name)); |
259 | Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type)); | 259 | Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type)); |
260 | Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID)); | 260 | Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID)); |
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
296 | InventoryFolderBase myFolder = new InventoryFolderBase(); | 296 | InventoryFolderBase myFolder = new InventoryFolderBase(); |
297 | myFolder.ID = folderToMoveId; | 297 | myFolder.ID = folderToMoveId; |
298 | Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True); | 298 | Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True); |
299 | Assert.That(myScene.InventoryService.QueryFolder(myFolder).ParentID, Is.EqualTo(folder2Id)); | 299 | Assert.That(myScene.InventoryService.GetFolder(myFolder).ParentID, Is.EqualTo(folder2Id)); |
300 | 300 | ||
301 | Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False); | 301 | Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False); |
302 | } | 302 | } |
@@ -322,13 +322,13 @@ namespace OpenSim.Framework.Communications.Tests | |||
322 | myFolder.ID = folder1Id; | 322 | myFolder.ID = folder1Id; |
323 | 323 | ||
324 | userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID); | 324 | userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID); |
325 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null); | 325 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null); |
326 | 326 | ||
327 | // Test purge | 327 | // Test purge |
328 | userInfo.PurgeFolder(rootFolder.ID); | 328 | userInfo.PurgeFolder(rootFolder.ID); |
329 | 329 | ||
330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); | 330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); |
331 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null); | 331 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); |
332 | } | 332 | } |
333 | } | 333 | } |
334 | } \ No newline at end of file | 334 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index b1b7809..3161364 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -552,12 +552,12 @@ namespace OpenSim.Framework.Communications.Tests | |||
552 | return false; | 552 | return false; |
553 | } | 553 | } |
554 | 554 | ||
555 | public InventoryItemBase QueryItem(InventoryItemBase item) | 555 | public InventoryItemBase GetItem(InventoryItemBase item) |
556 | { | 556 | { |
557 | return null; | 557 | return null; |
558 | } | 558 | } |
559 | 559 | ||
560 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 560 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
561 | { | 561 | { |
562 | return null; | 562 | return null; |
563 | } | 563 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index aaa236c..a3e275d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -6611,7 +6611,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6611 | { | 6611 | { |
6612 | //InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); | 6612 | //InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); |
6613 | IInventoryService invService = m_scene.RequestModuleInterface<IInventoryService>(); | 6613 | IInventoryService invService = m_scene.RequestModuleInterface<IInventoryService>(); |
6614 | InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(itemID)); | 6614 | InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(itemID)); |
6615 | if (assetRequestItem == null) | 6615 | if (assetRequestItem == null) |
6616 | { | 6616 | { |
6617 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); | 6617 | assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); |
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 547f923..582beee 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
130 | } | 130 | } |
131 | else | 131 | else |
132 | { | 132 | { |
133 | InventoryItemBase baseItem = invService.QueryItem(new InventoryItemBase(appearance.Wearables[i].ItemID)); | 133 | InventoryItemBase baseItem = invService.GetItem(new InventoryItemBase(appearance.Wearables[i].ItemID)); |
134 | 134 | ||
135 | if (baseItem != null) | 135 | if (baseItem != null) |
136 | { | 136 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index e61648c..a68db1b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures | |||
65 | { | 65 | { |
66 | IInventoryService invService = m_scene.InventoryService; | 66 | IInventoryService invService = m_scene.InventoryService; |
67 | 67 | ||
68 | InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId)); | 68 | InventoryItemBase item = invService.GetItem(new InventoryItemBase(gestureId)); |
69 | if (item != null) | 69 | if (item != null) |
70 | { | 70 | { |
71 | item.Flags = 1; | 71 | item.Flags = 1; |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures | |||
80 | { | 80 | { |
81 | IInventoryService invService = m_scene.InventoryService; | 81 | IInventoryService invService = m_scene.InventoryService; |
82 | 82 | ||
83 | InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId)); | 83 | InventoryItemBase item = invService.GetItem(new InventoryItemBase(gestureId)); |
84 | if (item != null) | 84 | if (item != null) |
85 | { | 85 | { |
86 | item.Flags = 0; | 86 | item.Flags = 0; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index b5650fd..5315c11 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
258 | 258 | ||
259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | 259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip |
260 | 260 | ||
261 | InventoryItemBase item = invService.QueryItem(new InventoryItemBase(inventoryEntityID)); | 261 | InventoryItemBase item = invService.GetItem(new InventoryItemBase(inventoryEntityID)); |
262 | InventoryFolderBase folder = null; | 262 | InventoryFolderBase folder = null; |
263 | 263 | ||
264 | if (item != null && trashFolder != null) | 264 | if (item != null && trashFolder != null) |
@@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
271 | } | 271 | } |
272 | else | 272 | else |
273 | { | 273 | { |
274 | folder = invService.QueryFolder(new InventoryFolderBase(inventoryEntityID)); | 274 | folder = invService.GetFolder(new InventoryFolderBase(inventoryEntityID)); |
275 | 275 | ||
276 | if (folder != null & trashFolder != null) | 276 | if (folder != null & trashFolder != null) |
277 | { | 277 | { |
@@ -428,7 +428,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
428 | 428 | ||
429 | // Fetch from service | 429 | // Fetch from service |
430 | // | 430 | // |
431 | folder = invService.QueryFolder(folder); | 431 | folder = invService.GetFolder(folder); |
432 | if (folder == null) | 432 | if (folder == null) |
433 | { | 433 | { |
434 | m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give"); | 434 | m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give"); |
@@ -458,7 +458,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
458 | 458 | ||
459 | // Fetch from service | 459 | // Fetch from service |
460 | // | 460 | // |
461 | item = invService.QueryItem(item); | 461 | item = invService.GetItem(item); |
462 | if (item == null) | 462 | if (item == null) |
463 | { | 463 | { |
464 | m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); | 464 | m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs index 375faf5..0526bc4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | |||
@@ -184,9 +184,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
184 | /// <returns>true if the item was successfully deleted</returns> | 184 | /// <returns>true if the item was successfully deleted</returns> |
185 | public abstract bool DeleteItem(InventoryItemBase item); | 185 | public abstract bool DeleteItem(InventoryItemBase item); |
186 | 186 | ||
187 | public abstract InventoryItemBase QueryItem(InventoryItemBase item); | 187 | public abstract InventoryItemBase GetItem(InventoryItemBase item); |
188 | 188 | ||
189 | public abstract InventoryFolderBase QueryFolder(InventoryFolderBase folder); | 189 | public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder); |
190 | 190 | ||
191 | /// <summary> | 191 | /// <summary> |
192 | /// Does the given user have an inventory structure? | 192 | /// Does the given user have an inventory structure? |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 62b9bed..db4e7f4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -387,13 +387,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
387 | } | 387 | } |
388 | } | 388 | } |
389 | 389 | ||
390 | public override InventoryItemBase QueryItem(InventoryItemBase item) | 390 | public override InventoryItemBase GetItem(InventoryItemBase item) |
391 | { | 391 | { |
392 | if (item == null) | 392 | if (item == null) |
393 | return null; | 393 | return null; |
394 | 394 | ||
395 | if (IsLocalGridUser(item.Owner)) | 395 | if (IsLocalGridUser(item.Owner)) |
396 | return m_GridService.QueryItem(item); | 396 | return m_GridService.GetItem(item); |
397 | else | 397 | else |
398 | { | 398 | { |
399 | UUID sessionID = GetSessionID(item.Owner); | 399 | UUID sessionID = GetSessionID(item.Owner); |
@@ -402,13 +402,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
402 | } | 402 | } |
403 | } | 403 | } |
404 | 404 | ||
405 | public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 405 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) |
406 | { | 406 | { |
407 | if (folder == null) | 407 | if (folder == null) |
408 | return null; | 408 | return null; |
409 | 409 | ||
410 | if (IsLocalGridUser(folder.Owner)) | 410 | if (IsLocalGridUser(folder.Owner)) |
411 | return m_GridService.QueryFolder(folder); | 411 | return m_GridService.GetFolder(folder); |
412 | else | 412 | else |
413 | { | 413 | { |
414 | UUID sessionID = GetSessionID(folder.Owner); | 414 | UUID sessionID = GetSessionID(folder.Owner); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 6efe903..ccf06d1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -292,14 +292,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
292 | return m_InventoryService.DeleteItem(item); | 292 | return m_InventoryService.DeleteItem(item); |
293 | } | 293 | } |
294 | 294 | ||
295 | public override InventoryItemBase QueryItem(InventoryItemBase item) | 295 | public override InventoryItemBase GetItem(InventoryItemBase item) |
296 | { | 296 | { |
297 | return m_InventoryService.QueryItem(item); | 297 | return m_InventoryService.GetItem(item); |
298 | } | 298 | } |
299 | 299 | ||
300 | public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 300 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) |
301 | { | 301 | { |
302 | return m_InventoryService.QueryFolder(folder); | 302 | return m_InventoryService.GetFolder(folder); |
303 | } | 303 | } |
304 | 304 | ||
305 | /// <summary> | 305 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index f87aab9..4f19573 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
273 | return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); | 273 | return m_RemoteConnector.DeleteItem(item.Owner.ToString(), item, sessionID); |
274 | } | 274 | } |
275 | 275 | ||
276 | public override InventoryItemBase QueryItem(InventoryItemBase item) | 276 | public override InventoryItemBase GetItem(InventoryItemBase item) |
277 | { | 277 | { |
278 | if (item == null) | 278 | if (item == null) |
279 | return null; | 279 | return null; |
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
282 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); | 282 | return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID); |
283 | } | 283 | } |
284 | 284 | ||
285 | public override InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 285 | public override InventoryFolderBase GetFolder(InventoryFolderBase folder) |
286 | { | 286 | { |
287 | if (folder == null) | 287 | if (folder == null) |
288 | return null; | 288 | return null; |
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 8f99395..9c71b41 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -966,7 +966,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
966 | if (objectID == UUID.Zero) // User inventory | 966 | if (objectID == UUID.Zero) // User inventory |
967 | { | 967 | { |
968 | IInventoryService invService = m_scene.InventoryService; | 968 | IInventoryService invService = m_scene.InventoryService; |
969 | InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(notecard)); | 969 | InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(notecard)); |
970 | if (assetRequestItem == null) // Library item | 970 | if (assetRequestItem == null) // Library item |
971 | { | 971 | { |
972 | assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); | 972 | assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); |
@@ -1385,7 +1385,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1385 | if (objectID == UUID.Zero) // User inventory | 1385 | if (objectID == UUID.Zero) // User inventory |
1386 | { | 1386 | { |
1387 | IInventoryService invService = m_scene.InventoryService; | 1387 | IInventoryService invService = m_scene.InventoryService; |
1388 | InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(script)); | 1388 | InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(script)); |
1389 | if (assetRequestItem == null) // Library item | 1389 | if (assetRequestItem == null) // Library item |
1390 | { | 1390 | { |
1391 | assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script); | 1391 | assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script); |
@@ -1479,7 +1479,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1479 | if (objectID == UUID.Zero) // User inventory | 1479 | if (objectID == UUID.Zero) // User inventory |
1480 | { | 1480 | { |
1481 | IInventoryService invService = m_scene.InventoryService; | 1481 | IInventoryService invService = m_scene.InventoryService; |
1482 | InventoryItemBase assetRequestItem = invService.QueryItem(new InventoryItemBase(notecard)); | 1482 | InventoryItemBase assetRequestItem = invService.GetItem(new InventoryItemBase(notecard)); |
1483 | if (assetRequestItem == null) // Library item | 1483 | if (assetRequestItem == null) // Library item |
1484 | { | 1484 | { |
1485 | assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); | 1485 | assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); |
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index 1b93f46..dd6928f 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
119 | { | 119 | { |
120 | InventoryItemBase item = new InventoryItemBase(itemID); | 120 | InventoryItemBase item = new InventoryItemBase(itemID); |
121 | item.Owner = remoteClient.AgentId; | 121 | item.Owner = remoteClient.AgentId; |
122 | item = InventoryService.QueryItem(item); | 122 | item = InventoryService.GetItem(item); |
123 | //if (item == null) | 123 | //if (item == null) |
124 | //{ // Fetch the item | 124 | //{ // Fetch the item |
125 | // item = new InventoryItemBase(); | 125 | // item = new InventoryItemBase(); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index cd91e8c..a941a74 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | /// <returns></returns> | 140 | /// <returns></returns> |
141 | public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) | 141 | public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) |
142 | { | 142 | { |
143 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 143 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
144 | 144 | ||
145 | if (item != null) | 145 | if (item != null) |
146 | { | 146 | { |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
315 | public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, | 315 | public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, |
316 | UUID itemID, InventoryItemBase itemUpd) | 316 | UUID itemID, InventoryItemBase itemUpd) |
317 | { | 317 | { |
318 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 318 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
319 | 319 | ||
320 | if (item != null) | 320 | if (item != null) |
321 | { | 321 | { |
@@ -408,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
408 | { | 408 | { |
409 | Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); | 409 | Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); |
410 | 410 | ||
411 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemId)); | 411 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemId)); |
412 | 412 | ||
413 | if ((item != null) && (item.Owner == senderId)) | 413 | if ((item != null) && (item.Owner == senderId)) |
414 | { | 414 | { |
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
505 | UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId) | 505 | UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId) |
506 | { | 506 | { |
507 | //// Retrieve the folder from the sender | 507 | //// Retrieve the folder from the sender |
508 | InventoryFolderBase folder = InventoryService.QueryFolder(new InventoryFolderBase(folderId)); | 508 | InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId)); |
509 | if (null == folder) | 509 | if (null == folder) |
510 | { | 510 | { |
511 | m_log.ErrorFormat( | 511 | m_log.ErrorFormat( |
@@ -558,7 +558,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
558 | 558 | ||
559 | if (item == null) | 559 | if (item == null) |
560 | { | 560 | { |
561 | item = InventoryService.QueryItem(new InventoryItemBase(oldItemID)); | 561 | item = InventoryService.GetItem(new InventoryItemBase(oldItemID)); |
562 | 562 | ||
563 | if (item == null) | 563 | if (item == null) |
564 | { | 564 | { |
@@ -636,7 +636,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
636 | m_log.DebugFormat( | 636 | m_log.DebugFormat( |
637 | "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); | 637 | "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); |
638 | 638 | ||
639 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 639 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
640 | 640 | ||
641 | if (item != null) | 641 | if (item != null) |
642 | { | 642 | { |
@@ -1224,7 +1224,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1224 | UUID copyID = UUID.Random(); | 1224 | UUID copyID = UUID.Random(); |
1225 | if (itemID != UUID.Zero) | 1225 | if (itemID != UUID.Zero) |
1226 | { | 1226 | { |
1227 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 1227 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
1228 | 1228 | ||
1229 | // Try library | 1229 | // Try library |
1230 | if (null == item) | 1230 | if (null == item) |
@@ -1287,7 +1287,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1287 | 1287 | ||
1288 | if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory | 1288 | if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory |
1289 | { | 1289 | { |
1290 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 1290 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
1291 | 1291 | ||
1292 | // Try library | 1292 | // Try library |
1293 | // XXX clumsy, possibly should be one call | 1293 | // XXX clumsy, possibly should be one call |
@@ -1673,7 +1673,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1673 | if (DeRezAction.SaveToExistingUserInventoryItem == action) | 1673 | if (DeRezAction.SaveToExistingUserInventoryItem == action) |
1674 | { | 1674 | { |
1675 | item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); | 1675 | item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); |
1676 | item = InventoryService.QueryItem(item); | 1676 | item = InventoryService.GetItem(item); |
1677 | 1677 | ||
1678 | //item = userInfo.RootFolder.FindItem( | 1678 | //item = userInfo.RootFolder.FindItem( |
1679 | // objectGroup.RootPart.FromUserInventoryItemID); | 1679 | // objectGroup.RootPart.FromUserInventoryItemID); |
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1834 | 1834 | ||
1835 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); | 1835 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); |
1836 | 1836 | ||
1837 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 1837 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
1838 | 1838 | ||
1839 | if (item != null) | 1839 | if (item != null) |
1840 | { | 1840 | { |
@@ -1984,7 +1984,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1984 | BypassRayCast, bRayEndIsIntersection,true,scale, false); | 1984 | BypassRayCast, bRayEndIsIntersection,true,scale, false); |
1985 | 1985 | ||
1986 | // Rez object | 1986 | // Rez object |
1987 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 1987 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
1988 | 1988 | ||
1989 | if (item != null) | 1989 | if (item != null) |
1990 | { | 1990 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index e2debe5..bcc9bcb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -382,7 +382,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
382 | return; | 382 | return; |
383 | } | 383 | } |
384 | 384 | ||
385 | InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); | 385 | InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); |
386 | 386 | ||
387 | if (item != null) | 387 | if (item != null) |
388 | { | 388 | { |
@@ -516,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
516 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) | 516 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) |
517 | { | 517 | { |
518 | InventoryFolderBase folder = new InventoryFolderBase(folderID); | 518 | InventoryFolderBase folder = new InventoryFolderBase(folderID); |
519 | folder = InventoryService.QueryFolder(folder); | 519 | folder = InventoryService.GetFolder(folder); |
520 | if (folder != null) | 520 | if (folder != null) |
521 | { | 521 | { |
522 | folder.ParentID = parentID; | 522 | folder.ParentID = parentID; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index af2753c..f28352c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1020,11 +1020,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1020 | 1020 | ||
1021 | public bool WaitForCallback(UUID id) | 1021 | public bool WaitForCallback(UUID id) |
1022 | { | 1022 | { |
1023 | int count = 20; | 1023 | int count = 200; |
1024 | while (m_agentsInTransit.Contains(id) && count-- > 0) | 1024 | while (m_agentsInTransit.Contains(id) && count-- > 0) |
1025 | { | 1025 | { |
1026 | //m_log.Debug(" >>> Waiting... " + count); | 1026 | //m_log.Debug(" >>> Waiting... " + count); |
1027 | Thread.Sleep(1000); | 1027 | Thread.Sleep(100); |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | if (count > 0) | 1030 | if (count > 0) |
@@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1141 | { | 1141 | { |
1142 | pos = pos + (agent.Velocity); | 1142 | pos = pos + (agent.Velocity); |
1143 | 1143 | ||
1144 | CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); | 1144 | //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); |
1145 | if (userInfo != null) | 1145 | //if (userInfo != null) |
1146 | { | 1146 | //{ |
1147 | userInfo.DropInventory(); | 1147 | // userInfo.DropInventory(); |
1148 | } | 1148 | //} |
1149 | else | 1149 | //else |
1150 | { | 1150 | //{ |
1151 | m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", | 1151 | // m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", |
1152 | agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); | 1152 | // agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); |
1153 | } | 1153 | //} |
1154 | 1154 | ||
1155 | //bool crossingSuccessful = | 1155 | //bool crossingSuccessful = |
1156 | // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, | 1156 | // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, |
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs index 8d104ac..63cf034 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs | |||
@@ -110,11 +110,11 @@ namespace OpenSim.Server.Handlers.Inventory | |||
110 | 110 | ||
111 | m_httpServer.AddStreamHandler( | 111 | m_httpServer.AddStreamHandler( |
112 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( | 112 | new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>( |
113 | "POST", "/QueryItem/", m_InventoryService.QueryItem, CheckAuthSession)); | 113 | "POST", "/QueryItem/", m_InventoryService.GetItem, CheckAuthSession)); |
114 | 114 | ||
115 | m_httpServer.AddStreamHandler( | 115 | m_httpServer.AddStreamHandler( |
116 | new RestDeserialiseSecureHandler<InventoryFolderBase, InventoryFolderBase>( | 116 | new RestDeserialiseSecureHandler<InventoryFolderBase, InventoryFolderBase>( |
117 | "POST", "/QueryFolder/", m_InventoryService.QueryFolder, CheckAuthSession)); | 117 | "POST", "/QueryFolder/", m_InventoryService.GetFolder, CheckAuthSession)); |
118 | 118 | ||
119 | m_httpServer.AddStreamHandler( | 119 | m_httpServer.AddStreamHandler( |
120 | new RestDeserialiseTrustedHandler<Guid, bool>( | 120 | new RestDeserialiseTrustedHandler<Guid, bool>( |
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index 22289aa..41aacd0 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -156,12 +156,12 @@ namespace OpenSim.Services.Connectors | |||
156 | return false; | 156 | return false; |
157 | } | 157 | } |
158 | 158 | ||
159 | public InventoryItemBase QueryItem(InventoryItemBase item) | 159 | public InventoryItemBase GetItem(InventoryItemBase item) |
160 | { | 160 | { |
161 | return null; | 161 | return null; |
162 | } | 162 | } |
163 | 163 | ||
164 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 164 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
165 | { | 165 | { |
166 | return null; | 166 | return null; |
167 | } | 167 | } |
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index 8058aa7..6256c32 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
@@ -149,9 +149,9 @@ namespace OpenSim.Services.Interfaces | |||
149 | /// <returns>true if the item was successfully deleted</returns> | 149 | /// <returns>true if the item was successfully deleted</returns> |
150 | bool DeleteItem(InventoryItemBase item); | 150 | bool DeleteItem(InventoryItemBase item); |
151 | 151 | ||
152 | InventoryItemBase QueryItem(InventoryItemBase item); | 152 | InventoryItemBase GetItem(InventoryItemBase item); |
153 | 153 | ||
154 | InventoryFolderBase QueryFolder(InventoryFolderBase folder); | 154 | InventoryFolderBase GetFolder(InventoryFolderBase folder); |
155 | 155 | ||
156 | /// <summary> | 156 | /// <summary> |
157 | /// Does the given user have an inventory structure? | 157 | /// Does the given user have an inventory structure? |
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index a9ecda4..3d706dc 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -398,7 +398,7 @@ namespace OpenSim.Services.InventoryService | |||
398 | return true; | 398 | return true; |
399 | } | 399 | } |
400 | 400 | ||
401 | public virtual InventoryItemBase QueryItem(InventoryItemBase item) | 401 | public virtual InventoryItemBase GetItem(InventoryItemBase item) |
402 | { | 402 | { |
403 | InventoryItemBase result = m_Database.queryInventoryItem(item.ID); | 403 | InventoryItemBase result = m_Database.queryInventoryItem(item.ID); |
404 | if (result != null) | 404 | if (result != null) |
@@ -407,7 +407,7 @@ namespace OpenSim.Services.InventoryService | |||
407 | return null; | 407 | return null; |
408 | } | 408 | } |
409 | 409 | ||
410 | public virtual InventoryFolderBase QueryFolder(InventoryFolderBase item) | 410 | public virtual InventoryFolderBase GetFolder(InventoryFolderBase item) |
411 | { | 411 | { |
412 | InventoryFolderBase result = m_Database.queryInventoryFolder(item.ID); | 412 | InventoryFolderBase result = m_Database.queryInventoryFolder(item.ID); |
413 | if (result != null) | 413 | if (result != null) |
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/TestInventoryService.cs index 6635700..6576533 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryService.cs | |||
@@ -148,12 +148,12 @@ namespace OpenSim.Tests.Common.Mock | |||
148 | return false; | 148 | return false; |
149 | } | 149 | } |
150 | 150 | ||
151 | public InventoryItemBase QueryItem(InventoryItemBase item) | 151 | public InventoryItemBase GetItem(InventoryItemBase item) |
152 | { | 152 | { |
153 | return null; | 153 | return null; |
154 | } | 154 | } |
155 | 155 | ||
156 | public InventoryFolderBase QueryFolder(InventoryFolderBase folder) | 156 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
157 | { | 157 | { |
158 | return null; | 158 | return null; |
159 | } | 159 | } |