aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-02-18 16:06:01 -0800
committerDiva Canto2013-02-18 16:06:01 -0800
commit4e846d55a8277224ee338d55ff2fad05957227ae (patch)
treeae0fa978b0ea76c7c087eff155e048bc8ba72513 /OpenSim
parentDonating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll (diff)
parentminor: Rename regression test method TestGetArrayLength() -> JsonTestGetArray... (diff)
downloadopensim-SC_OLD-4e846d55a8277224ee338d55ff2fad05957227ae.zip
opensim-SC_OLD-4e846d55a8277224ee338d55ff2fad05957227ae.tar.gz
opensim-SC_OLD-4e846d55a8277224ee338d55ff2fad05957227ae.tar.bz2
opensim-SC_OLD-4e846d55a8277224ee338d55ff2fad05957227ae.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index 3d9ad16..db82d4b 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -400,7 +400,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
400// } 400// }
401 401
402 [Test] 402 [Test]
403 public void TestGetArrayLength() 403 public void TestJsonGetArrayLength()
404 { 404 {
405 TestHelpers.InMethod(); 405 TestHelpers.InMethod();
406// TestHelpers.EnableLogging(); 406// TestHelpers.EnableLogging();