aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-06-26 10:48:52 +0200
committerMelanie2012-06-26 10:48:52 +0200
commit2548d158783cd15b44cb485c10894740cbdb3efe (patch)
tree00c1c1a04e8ac34ae67b3f404367db49a8735361
parentCorrect a wrong error constant (diff)
downloadopensim-SC_OLD-2548d158783cd15b44cb485c10894740cbdb3efe.zip
opensim-SC_OLD-2548d158783cd15b44cb485c10894740cbdb3efe.tar.gz
opensim-SC_OLD-2548d158783cd15b44cb485c10894740cbdb3efe.tar.bz2
opensim-SC_OLD-2548d158783cd15b44cb485c10894740cbdb3efe.tar.xz
Disable physics raycast until it can be seen to. Fix distance calculation
for some results.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fe85118..a0dc6cd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12379,9 +12379,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12379 12379
12380 ContactResult result = new ContactResult (); 12380 ContactResult result = new ContactResult ();
12381 result.ConsumerID = group.LocalId; 12381 result.ConsumerID = group.LocalId;
12382 result.Depth = intersection.distance; 12382// result.Depth = intersection.distance;
12383 result.Normal = intersection.normal; 12383 result.Normal = intersection.normal;
12384 result.Pos = intersection.ipoint; 12384 result.Pos = intersection.ipoint;
12385 result.Depth = Vector3.Mag(rayStart - result.Pos);
12385 12386
12386 contacts.Add(result); 12387 contacts.Add(result);
12387 }); 12388 });
@@ -12576,7 +12577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12576 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); 12577 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
12577 12578
12578 12579
12579 if (World.SuportsRayCastFiltered()) 12580 if (false)// World.SuportsRayCastFiltered())
12580 { 12581 {
12581 if (dist == 0) 12582 if (dist == 0)
12582 return list; 12583 return list;