aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/ConfigurationLoaderTest.cs
diff options
context:
space:
mode:
authorDiva Canto2013-02-28 14:20:31 -0800
committerDiva Canto2013-02-28 14:20:31 -0800
commit433102108b903669cef632feff871fe9bc37021c (patch)
treed530ec4b8164d569a8064b0beaef37cde2f279ae /OpenSim/Tests/ConfigurationLoaderTest.cs
parentBug fix in DataSnapshot, where a var was being used before being initialized. (diff)
parentFix potential concurrency issue since the LSL notecard cache was not being ch... (diff)
downloadopensim-SC_OLD-433102108b903669cef632feff871fe9bc37021c.zip
opensim-SC_OLD-433102108b903669cef632feff871fe9bc37021c.tar.gz
opensim-SC_OLD-433102108b903669cef632feff871fe9bc37021c.tar.bz2
opensim-SC_OLD-433102108b903669cef632feff871fe9bc37021c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/ConfigurationLoaderTest.cs')
-rw-r--r--OpenSim/Tests/ConfigurationLoaderTest.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs
index 9d63324..a409a13 100644
--- a/OpenSim/Tests/ConfigurationLoaderTest.cs
+++ b/OpenSim/Tests/ConfigurationLoaderTest.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Tests
45 /// Set up a test directory. 45 /// Set up a test directory.
46 /// </summary> 46 /// </summary>
47 [SetUp] 47 [SetUp]
48 public void SetUp() 48 public override void SetUp()
49 { 49 {
50 base.SetUp(); 50 base.SetUp();
51 51