diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Data/Tests | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Data/Tests')
| -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 | ||