diff options
| author | BlueWall | 2012-12-07 15:36:43 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-07 15:36:43 -0500 |
| commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
| tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index b768257..ac25a93 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -57,8 +57,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 57 | protected TestClient m_tc; | 57 | protected TestClient m_tc; |
| 58 | 58 | ||
| 59 | [SetUp] | 59 | [SetUp] |
| 60 | public void SetUp() | 60 | public override void SetUp() |
| 61 | { | 61 | { |
| 62 | base.SetUp(); | ||
| 63 | |||
| 62 | m_iam = new BasicInventoryAccessModule(); | 64 | m_iam = new BasicInventoryAccessModule(); |
| 63 | 65 | ||
| 64 | IConfigSource config = new IniConfigSource(); | 66 | IConfigSource config = new IniConfigSource(); |