aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorUbitUmarov2012-05-15 00:04:40 +0100
committerUbitUmarov2012-05-15 00:04:40 +0100
commit1b81ce303e3648ad745bae5c6904051eaa0cfd9b (patch)
treeef851e00f0b48b2a9bd078c713d5fe0dad067ce5 /OpenSim/Data
parentmake llGetCameraPos and llGetCameraRot apply to avatar that granted permissio... (diff)
parentCompletely revamp collision handling. Now works as it is supposed to. (diff)
downloadopensim-SC-1b81ce303e3648ad745bae5c6904051eaa0cfd9b.zip
opensim-SC-1b81ce303e3648ad745bae5c6904051eaa0cfd9b.tar.gz
opensim-SC-1b81ce303e3648ad745bae5c6904051eaa0cfd9b.tar.bz2
opensim-SC-1b81ce303e3648ad745bae5c6904051eaa0cfd9b.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs1
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