Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-05-14 23:33:16 +01:00
6 changed files with 198 additions and 528 deletions

View File

@@ -632,7 +632,6 @@ namespace OpenSim.Data.Tests
.IgnoreProperty(x=>x.RegionUUID)
.IgnoreProperty(x=>x.Scene)
.IgnoreProperty(x=>x.Parts)
.IgnoreProperty(x=>x.PassCollision)
.IgnoreProperty(x=>x.RootPart));
}