aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-27 19:36:52 -0400
committerTeravus Ovares (Dan Olivares)2009-08-27 19:36:52 -0400
commit65dda8a795b658a39c2f617124a31c928030fb4b (patch)
treea95c5e5d82fecd321c76abb6dd26737a3fff4629 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
parentRemove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid dup... (diff)
downloadopensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.zip
opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.gz
opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.bz2
opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs11
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 3ee6007..8cd1d55 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -378,6 +378,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
378 Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects"); 378 Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
379 } 379 }
380 380
381 [TearDown]
382 public void TearDown()
383 {
384 if (MainServer.Instance != null) MainServer.Instance.Stop();
385 }
386
381 public static string GetRandomCapsObjectPath() 387 public static string GetRandomCapsObjectPath()
382 { 388 {
383 TestHelper.InMethod(); 389 TestHelper.InMethod();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 23eab90..1d460dd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -78,6 +78,17 @@ namespace OpenSim.Region.Framework.Scenes.Tests
78 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 78 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
79 } 79 }
80 80
81 [TearDown]
82 public void TearDown()
83 {
84 try
85 {
86 if (MainServer.Instance != null) MainServer.Instance.Stop();
87 }
88 catch (NullReferenceException)
89 { }
90 }
91
81 } 92 }
82 93
83 public class ThreadRunResults 94 public class ThreadRunResults