aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorDiva Canto2010-02-22 09:56:33 -0800
committerDiva Canto2010-02-22 09:56:33 -0800
commitde91a9e09bbb6c41eeb022540ae08952f413fb12 (patch)
treef4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Data
parentDeleted duplicate [GridService] section. (diff)
parentMerge branch 'master' into presence-refactor (diff)
downloadopensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2
opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 676c6ba..dfbf522 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -524,7 +524,7 @@ namespace OpenSim.Data.Tests
524 } 524 }
525 } 525 }
526 526
527 [Test] 527 //[Test]
528 public void T016_RandomSogWithSceneParts() 528 public void T016_RandomSogWithSceneParts()
529 { 529 {
530 PropertyScrambler<SceneObjectPart> scrambler = 530 PropertyScrambler<SceneObjectPart> scrambler =