ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into ubitwork

Browse Source
This commit is contained in:
UbitUmarov
2012-06-28 10:57:47 +01:00
parent 9ca9770cf6 625041f1db
commit de10a16546
6 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -12416,9 +12416,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ContactResult result = new ContactResult ();
result.ConsumerID = group.LocalId;
result.Depth = intersection.distance;
// result.Depth = intersection.distance;
result.Normal = intersection.normal;
result.Pos = intersection.ipoint;
result.Depth = Vector3.Mag(rayStart - result.Pos);
contacts.Add(result);
});
@@ -12613,7 +12614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
if (World.SuportsRayCastFiltered())
if (false)// World.SuportsRayCastFiltered())
{
if (dist == 0)
return list;

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -667,7 +667,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public static readonly LSLInteger RCERR_UNKNOWN = -1;
public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3;
public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
public const int KFM_MODE = 1;
public const int KFM_LOOP = 1;