diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/Region/CoreModules/Asset/Tests | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/Tests')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs index 5adb845..c91b25f 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
| @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests | |||
| 65 | config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true"); | 65 | config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true"); |
| 66 | 66 | ||
| 67 | m_cache = new FlotsamAssetCache(); | 67 | m_cache = new FlotsamAssetCache(); |
| 68 | m_scene = SceneHelpers.SetupScene(); | 68 | m_scene = new SceneHelpers().SetupScene(); |
| 69 | SceneHelpers.SetupSceneModules(m_scene, config, m_cache); | 69 | SceneHelpers.SetupSceneModules(m_scene, config, m_cache); |
| 70 | } | 70 | } |
| 71 | 71 | ||