diff options
| author | Justin Clark-Casey (justincc) | 2010-09-04 00:09:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-04 00:09:53 +0100 |
| commit | 107052b23db4d16c8d1d5f8c828da7d6f6afd6b4 (patch) | |
| tree | 211bb13b37b35795ad7264f0ea6e56d4db7942b8 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-107052b23db4d16c8d1d5f8c828da7d6f6afd6b4.zip opensim-SC_OLD-107052b23db4d16c8d1d5f8c828da7d6f6afd6b4.tar.gz opensim-SC_OLD-107052b23db4d16c8d1d5f8c828da7d6f6afd6b4.tar.bz2 opensim-SC_OLD-107052b23db4d16c8d1d5f8c828da7d6f6afd6b4.tar.xz | |
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 0218f86..d66a1d0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
| @@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 163 | InventoryFolderBase objsFolder | 163 | InventoryFolderBase objsFolder |
| 164 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; | 164 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; |
| 165 | item1.Folder = objsFolder.ID; | 165 | item1.Folder = objsFolder.ID; |
| 166 | scene.AddInventoryItem(userId, item1); | 166 | scene.AddInventoryItem(item1); |
| 167 | 167 | ||
| 168 | MemoryStream archiveWriteStream = new MemoryStream(); | 168 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 169 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 169 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
| @@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 282 | InventoryFolderBase objsFolder | 282 | InventoryFolderBase objsFolder |
| 283 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; | 283 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; |
| 284 | item1.Folder = objsFolder.ID; | 284 | item1.Folder = objsFolder.ID; |
| 285 | scene.AddInventoryItem(userId, item1); | 285 | scene.AddInventoryItem(item1); |
| 286 | 286 | ||
| 287 | MemoryStream archiveWriteStream = new MemoryStream(); | 287 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 288 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 288 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
| @@ -485,7 +485,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 485 | InventoryFolderBase objsFolder | 485 | InventoryFolderBase objsFolder |
| 486 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; | 486 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0]; |
| 487 | item1.Folder = objsFolder.ID; | 487 | item1.Folder = objsFolder.ID; |
| 488 | scene.AddInventoryItem(userId, item1); | 488 | scene.AddInventoryItem(item1); |
| 489 | 489 | ||
| 490 | MemoryStream archiveWriteStream = new MemoryStream(); | 490 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 491 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 491 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |