diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /OpenSim/Region/CoreModules/Asset | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs index 0872cc8..fd02b08 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
| @@ -53,8 +53,10 @@ namespace OpenSim.Region.CoreModules.Asset.Tests | |||
| 53 | protected FlotsamAssetCache m_cache; | 53 | protected FlotsamAssetCache m_cache; |
| 54 | 54 | ||
| 55 | [SetUp] | 55 | [SetUp] |
| 56 | public void SetUp() | 56 | public override void SetUp() |
| 57 | { | 57 | { |
| 58 | base.SetUp(); | ||
| 59 | |||
| 58 | IConfigSource config = new IniConfigSource(); | 60 | IConfigSource config = new IniConfigSource(); |
| 59 | 61 | ||
| 60 | config.AddConfig("Modules"); | 62 | config.AddConfig("Modules"); |