diff options
author | Melanie | 2012-05-14 23:33:16 +0100 |
---|---|---|
committer | Melanie | 2012-05-14 23:33:16 +0100 |
commit | 71115c32ad68a546f8bbaf52408cdfadda21b352 (patch) | |
tree | 481a80299a300b95a6c64c49d76859045ca64892 /OpenSim/Data | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Completely revamp collision handling. Now works as it is supposed to. (diff) | |
download | opensim-SC_OLD-71115c32ad68a546f8bbaf52408cdfadda21b352.zip opensim-SC_OLD-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.gz opensim-SC_OLD-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.bz2 opensim-SC_OLD-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index 1f03ec5..474609b 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
@@ -632,7 +632,6 @@ namespace OpenSim.Data.Tests | |||
632 | .IgnoreProperty(x=>x.RegionUUID) | 632 | .IgnoreProperty(x=>x.RegionUUID) |
633 | .IgnoreProperty(x=>x.Scene) | 633 | .IgnoreProperty(x=>x.Scene) |
634 | .IgnoreProperty(x=>x.Parts) | 634 | .IgnoreProperty(x=>x.Parts) |
635 | .IgnoreProperty(x=>x.PassCollision) | ||
636 | .IgnoreProperty(x=>x.RootPart)); | 635 | .IgnoreProperty(x=>x.RootPart)); |
637 | } | 636 | } |
638 | 637 | ||