diff options
| author | Melanie | 2013-02-16 05:37:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-16 05:37:12 +0000 |
| commit | 192e1e7cf0aec73dc20db40196cd6d2f25578bfb (patch) | |
| tree | a4f580faa970039cb90bdca0e92a7d6b155a8276 /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Separate IAR tests into separate files for load/save/loadpath tests (diff) | |
| download | opensim-SC-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.zip opensim-SC-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.gz opensim-SC-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.bz2 opensim-SC-192e1e7cf0aec73dc20db40196cd6d2f25578bfb.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index ac25a93..ad1a0e1 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 109 | item1.AssetID = asset1.FullID; | 109 | item1.AssetID = asset1.FullID; |
| 110 | item1.ID = item1Id; | 110 | item1.ID = item1Id; |
| 111 | InventoryFolderBase objsFolder | 111 | InventoryFolderBase objsFolder |
| 112 | = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, m_userId, "Objects")[0]; | 112 | = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0]; |
| 113 | item1.Folder = objsFolder.ID; | 113 | item1.Folder = objsFolder.ID; |
| 114 | m_scene.AddInventoryItem(item1); | 114 | m_scene.AddInventoryItem(item1); |
| 115 | 115 | ||
| @@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 159 | item1.AssetID = asset1.FullID; | 159 | item1.AssetID = asset1.FullID; |
| 160 | item1.ID = item1Id; | 160 | item1.ID = item1Id; |
| 161 | InventoryFolderBase objsFolder | 161 | InventoryFolderBase objsFolder |
| 162 | = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, m_userId, "Objects")[0]; | 162 | = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, m_userId, "Objects")[0]; |
| 163 | item1.Folder = objsFolder.ID; | 163 | item1.Folder = objsFolder.ID; |
| 164 | m_scene.AddInventoryItem(item1); | 164 | m_scene.AddInventoryItem(item1); |
| 165 | 165 | ||