OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom

user_profiles
Justin Clark-Casey (justincc) 2013-02-02 01:34:49 +00:00
parent 9588328242
commit 2ff301ca11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.Manager
public delegate void JointDeactivated(PhysicsJoint joint); public delegate void JointDeactivated(PhysicsJoint joint);
public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
public enum RayFilterFlags:ushort public enum RayFilterFlags : ushort
{ {
// the flags // the flags
water = 0x01, water = 0x01,
@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.Manager
ClosestHit = 0x8000, ClosestHit = 0x8000,
// some combinations // some combinations
LSLPhanton = phantom | volumedtc, LSLPhantom = phantom | volumedtc,
PrimsNonPhantom = nonphysical | physical, PrimsNonPhantom = nonphysical | physical,
PrimsNonPhantomAgents = nonphysical | physical | agent, PrimsNonPhantomAgents = nonphysical | physical | agent,

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

@ -11381,7 +11381,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (checkNonPhysical) if (checkNonPhysical)
rayfilter |= RayFilterFlags.nonphysical; rayfilter |= RayFilterFlags.nonphysical;
if (detectPhantom) if (detectPhantom)
rayfilter |= RayFilterFlags.LSLPhanton; rayfilter |= RayFilterFlags.LSLPhantom;
Vector3 direction = dir * ( 1/dist); Vector3 direction = dir * ( 1/dist);