diff options
author | Kitto Flora | 2010-01-03 23:10:01 -0500 |
---|---|---|
committer | Kitto Flora | 2010-01-03 23:10:01 -0500 |
commit | 253e2ed699a899b74451ac51ed7875b3f98ffdd7 (patch) | |
tree | 8760330fd19b8ae367b79dd63408b33618c4eff2 /OpenSim/Data/Tests/BasicRegionTest.cs | |
parent | Vehicle Linear parameter adjustments (diff) | |
parent | Solve conflict (diff) | |
download | opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.zip opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.gz opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.bz2 opensim-SC-253e2ed699a899b74451ac51ed7875b3f98ffdd7.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Data/Tests/BasicRegionTest.cs')
-rw-r--r-- | OpenSim/Data/Tests/BasicRegionTest.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index f76962c..676c6ba 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -577,6 +577,7 @@ namespace OpenSim.Data.Tests | |||
577 | .IgnoreProperty(x=>x.RegionUUID) | 577 | .IgnoreProperty(x=>x.RegionUUID) |
578 | .IgnoreProperty(x=>x.Scene) | 578 | .IgnoreProperty(x=>x.Scene) |
579 | .IgnoreProperty(x=>x.Children) | 579 | .IgnoreProperty(x=>x.Children) |
580 | .IgnoreProperty(x=>x.PassCollision) | ||
580 | .IgnoreProperty(x=>x.RootPart)); | 581 | .IgnoreProperty(x=>x.RootPart)); |
581 | } | 582 | } |
582 | 583 | ||