aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-14 18:49:45 +0000
committerJustin Clarke Casey2009-04-14 18:49:45 +0000
commitd0744f8eca6adc2b6ae257f581792bd8eae16ea2 (patch)
treec6fe087005bb4d1a0ccf7ded71b611cec721a817 /OpenSim/Region/Framework
parentFix for minor bug introduced yesterday, HG only. Can't lookup the profile whe... (diff)
downloadopensim-SC-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.zip
opensim-SC-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.gz
opensim-SC-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.bz2
opensim-SC-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.xz
* Make archiver tests pump the asset server manually instead of starting the normal runtime thread
* This may eliminate the occasional archive test freezes, since they appeared to occur when somehow the asset server didn't pick up on the presence of a request in the asset quque
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index c781305..c00ef3c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
57 public UUID agent1, agent2, agent3; 57 public UUID agent1, agent2, agent3;
58 public static Random random; 58 public static Random random;
59 public ulong region1,region2,region3; 59 public ulong region1,region2,region3;
60 public CommunicationsManager cm; 60 public TestCommunicationsManager cm;
61 public AgentCircuitData acd1; 61 public AgentCircuitData acd1;
62 public SceneObjectGroup sog1, sog2, sog3; 62 public SceneObjectGroup sog1, sog2, sog3;
63 public TestClient testclient; 63 public TestClient testclient;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 80d2ba9..a0c956e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
60 60
61 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); 61 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
62 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); 62 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
63 CommunicationsManager cm = new TestCommunicationsManager(); 63 TestCommunicationsManager cm = new TestCommunicationsManager();
64 64
65 // shared module 65 // shared module
66 IRegionModule interregionComms = new RESTInterregionComms(); 66 IRegionModule interregionComms = new RESTInterregionComms();