diff options
author | Melanie | 2013-07-29 02:08:05 +0100 |
---|---|---|
committer | Melanie | 2013-07-29 02:08:05 +0100 |
commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Same issue. (diff) | |
download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs index bbfbbfc..bbe34d2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs | |||
@@ -119,7 +119,20 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
119 | 119 | ||
120 | UUID spUuid = TestHelpers.ParseTail(0x1); | 120 | UUID spUuid = TestHelpers.ParseTail(0x1); |
121 | 121 | ||
122 | // The etm is only invoked by this test to check whether an agent is still in transit if there is a dupe | ||
123 | EntityTransferModule etm = new EntityTransferModule(); | ||
124 | |||
125 | IConfigSource config = new IniConfigSource(); | ||
126 | IConfig modulesConfig = config.AddConfig("Modules"); | ||
127 | modulesConfig.Set("EntityTransferModule", etm.Name); | ||
128 | IConfig entityTransferConfig = config.AddConfig("EntityTransfer"); | ||
129 | |||
130 | // In order to run a single threaded regression test we do not want the entity transfer module waiting | ||
131 | // for a callback from the destination scene before removing its avatar data. | ||
132 | entityTransferConfig.Set("wait_for_callback", false); | ||
133 | |||
122 | TestScene scene = new SceneHelpers().SetupScene(); | 134 | TestScene scene = new SceneHelpers().SetupScene(); |
135 | SceneHelpers.SetupSceneModules(scene, config, etm); | ||
123 | SceneHelpers.AddScenePresence(scene, spUuid); | 136 | SceneHelpers.AddScenePresence(scene, spUuid); |
124 | SceneHelpers.AddScenePresence(scene, spUuid); | 137 | SceneHelpers.AddScenePresence(scene, spUuid); |
125 | 138 | ||