diff options
| author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
| commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
| tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Data/Tests/BasicRegionTest.cs | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz | |
Resolved merge
Diffstat (limited to 'OpenSim/Data/Tests/BasicRegionTest.cs')
| -rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 2 |
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 = |