diff options
| author | UbitUmarov | 2015-12-22 13:23:08 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-12-22 13:23:08 +0000 |
| commit | 5135214e5b03157e4408a7cf140ffb4893cf5e99 (patch) | |
| tree | f4b6e0a368e55c4745e2f9ecf8bb17d32a645fc4 /OpenSim | |
| parent | a few changes to physics new root avatar position height estimation (diff) | |
| download | opensim-SC_OLD-5135214e5b03157e4408a7cf140ffb4893cf5e99.zip opensim-SC_OLD-5135214e5b03157e4408a7cf140ffb4893cf5e99.tar.gz opensim-SC_OLD-5135214e5b03157e4408a7cf140ffb4893cf5e99.tar.bz2 opensim-SC_OLD-5135214e5b03157e4408a7cf140ffb4893cf5e99.tar.xz | |
physics landing: don't land on top of volume detectors
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4236195..4e63310 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1251,9 +1251,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1251 | { | 1251 | { |
| 1252 | // land check was done above | 1252 | // land check was done above |
| 1253 | RayFilterFlags rayfilter = RayFilterFlags.BackFaceCull; | 1253 | RayFilterFlags rayfilter = RayFilterFlags.BackFaceCull; |
| 1254 | rayfilter |= RayFilterFlags.physical; | 1254 | rayfilter |= RayFilterFlags.PrimsNonPhantomAgents; |
| 1255 | rayfilter |= RayFilterFlags.nonphysical; | ||
| 1256 | rayfilter |= RayFilterFlags.LSLPhantom; // ubODE will only see volume detectors | ||
| 1257 | 1255 | ||
| 1258 | int physcount = PhysNumberCollisions; | 1256 | int physcount = PhysNumberCollisions; |
| 1259 | 1257 | ||