diff options
| author | BlueWall | 2011-04-14 21:16:30 -0400 |
|---|---|---|
| committer | BlueWall | 2011-04-14 21:16:30 -0400 |
| commit | 37d2b6243be94ed3e71c0332e5aab7ddba1d1f69 (patch) | |
| tree | 8d04f5f9dcdc9980497b60e5b13f8e31803238ab /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
| parent | Add ColladaMesh switch (diff) | |
| parent | get rid of all traces of the now used mock service infrastructure (diff) | |
| download | opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.zip opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.gz opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.bz2 opensim-SC_OLD-37d2b6243be94ed3e71c0332e5aab7ddba1d1f69.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index 7a7a8c2..8d53cf1 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 66 | config.AddConfig("Modules"); | 66 | config.AddConfig("Modules"); |
| 67 | config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule"); | 67 | config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule"); |
| 68 | 68 | ||
| 69 | m_scene = SceneSetupHelpers.SetupScene("Inventory"); | 69 | m_scene = SceneSetupHelpers.SetupScene(); |
| 70 | SceneSetupHelpers.SetupSceneModules(m_scene, config, m_iam); | 70 | SceneSetupHelpers.SetupSceneModules(m_scene, config, m_iam); |
| 71 | 71 | ||
| 72 | // Create user | 72 | // Create user |