diff options
| author | Mic Bowman | 2011-04-18 11:29:43 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-18 11:29:43 -0700 |
| commit | 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch) | |
| tree | b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |
| parent | Remove the call to remove tokens from the parent. Under heavy load (diff) | |
| parent | Mantis #5442: Add admin_save_heightmap (diff) | |
| download | opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz | |
Merge branch 'master' into test-merge0418
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index 6b70865..dbf9e0f 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |||
| @@ -47,7 +47,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 47 | [SetUp] | 47 | [SetUp] |
| 48 | public void Init() | 48 | public void Init() |
| 49 | { | 49 | { |
| 50 | m_assetService = new MockAssetService(); | 50 | // FIXME: We don't need a full scene here - it would be enough to set up the asset service. |
| 51 | Scene scene = SceneSetupHelpers.SetupScene(); | ||
| 52 | m_assetService = scene.AssetService; | ||
| 51 | m_uuidGatherer = new UuidGatherer(m_assetService); | 53 | m_uuidGatherer = new UuidGatherer(m_assetService); |
| 52 | } | 54 | } |
| 53 | 55 | ||