diff options
author | UbitUmarov | 2015-12-21 17:56:12 +0000 |
---|---|---|
committer | UbitUmarov | 2015-12-21 17:56:12 +0000 |
commit | 7081ef948c4fa7e26ff15544a40f7be447db0bef (patch) | |
tree | a25442872a27991f4258ea30b5230cd9f5dffaea /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | add physics help on root agent arrival via some login types and if not under ... (diff) | |
download | opensim-SC_OLD-7081ef948c4fa7e26ff15544a40f7be447db0bef.zip opensim-SC_OLD-7081ef948c4fa7e26ff15544a40f7be447db0bef.tar.gz opensim-SC_OLD-7081ef948c4fa7e26ff15544a40f7be447db0bef.tar.bz2 opensim-SC_OLD-7081ef948c4fa7e26ff15544a40f7be447db0bef.tar.xz |
clean a bit
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 729d5a9..ec96519 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1110,12 +1110,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1110 | 1110 | ||
1111 | #region Status Methods | 1111 | #region Status Methods |
1112 | 1112 | ||
1113 | void PhysicsCheckPositionZ() | ||
1114 | { | ||
1115 | if(m_scene.PhysicsScene == null) | ||
1116 | return; | ||
1117 | } | ||
1118 | |||
1119 | /// <summary> | 1113 | /// <summary> |
1120 | /// Turns a child agent into a root agent. | 1114 | /// Turns a child agent into a root agent. |
1121 | /// </summary> | 1115 | /// </summary> |
@@ -1243,12 +1237,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1243 | 1237 | ||
1244 | if(checkPhysics) | 1238 | if(checkPhysics) |
1245 | { | 1239 | { |
1246 | // no land!! | 1240 | // land check was done above |
1247 | RayFilterFlags rayfilter = RayFilterFlags.ClosestAndBackCull; | 1241 | RayFilterFlags rayfilter = RayFilterFlags.ClosestAndBackCull; |
1248 | rayfilter |= RayFilterFlags.physical; | 1242 | rayfilter |= RayFilterFlags.physical; |
1249 | rayfilter |= RayFilterFlags.nonphysical; | 1243 | rayfilter |= RayFilterFlags.nonphysical; |
1250 | rayfilter |= RayFilterFlags.LSLPhantom; // ubODE will only see volume detectors | 1244 | rayfilter |= RayFilterFlags.LSLPhantom; // ubODE will only see volume detectors |
1251 | int physcount = 1; | 1245 | int physcount = 25; |
1252 | float dist = 1024f; | 1246 | float dist = 1024f; |
1253 | Vector3 direction = new Vector3(0f,0f,-1f); | 1247 | Vector3 direction = new Vector3(0f,0f,-1f); |
1254 | Vector3 RayStart = pos; | 1248 | Vector3 RayStart = pos; |