diff options
| author | Melanie | 2012-05-02 01:37:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-02 01:37:51 +0100 |
| commit | bf630fb808420c15abc100f11b993b9e6e1113c2 (patch) | |
| tree | 11a10a97e78725e96807c01a656123f934acb04a /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |
| parent | Merge branch 'avination' (diff) | |
| parent | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff) | |
| download | opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.zip opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.gz opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.bz2 opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs index 2e46377..1aa48d7 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |||
| @@ -128,7 +128,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 128 | IConfig config = configSource.AddConfig("Modules"); | 128 | IConfig config = configSource.AddConfig("Modules"); |
| 129 | config.Set("SimulationServices", "LocalSimulationConnectorModule"); | 129 | config.Set("SimulationServices", "LocalSimulationConnectorModule"); |
| 130 | 130 | ||
| 131 | TestScene scene = new SceneHelpers().SetupScene(); | 131 | SceneHelpers sceneHelpers = new SceneHelpers(); |
| 132 | TestScene scene = sceneHelpers.SetupScene(); | ||
| 132 | SceneHelpers.SetupSceneModules(scene, configSource, lsc); | 133 | SceneHelpers.SetupSceneModules(scene, configSource, lsc); |
| 133 | 134 | ||
| 134 | UUID agentId = TestHelpers.ParseTail(0x01); | 135 | UUID agentId = TestHelpers.ParseTail(0x01); |