diff options
author | Justin Clark-Casey (justincc) | 2013-02-02 01:34:49 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-02 01:34:49 +0000 |
commit | 2ff301ca113842c9a865a941833ca7231d3866b6 (patch) | |
tree | cc812758cefd183d586d37226a4d5c45d922ccc3 | |
parent | Stop exceptions being thrown if GenerateMapTiles = false but no static map ti... (diff) | |
download | opensim-SC-2ff301ca113842c9a865a941833ca7231d3866b6.zip opensim-SC-2ff301ca113842c9a865a941833ca7231d3866b6.tar.gz opensim-SC-2ff301ca113842c9a865a941833ca7231d3866b6.tar.bz2 opensim-SC-2ff301ca113842c9a865a941833ca7231d3866b6.tar.xz |
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 96a9ff7..c4d7ef3 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.Manager | |||
43 | public delegate void JointDeactivated(PhysicsJoint joint); | 43 | public delegate void JointDeactivated(PhysicsJoint joint); |
44 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" | 44 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" |
45 | 45 | ||
46 | public enum RayFilterFlags:ushort | 46 | public enum RayFilterFlags : ushort |
47 | { | 47 | { |
48 | // the flags | 48 | // the flags |
49 | water = 0x01, | 49 | water = 0x01, |
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.Manager | |||
60 | ClosestHit = 0x8000, | 60 | ClosestHit = 0x8000, |
61 | 61 | ||
62 | // some combinations | 62 | // some combinations |
63 | LSLPhanton = phantom | volumedtc, | 63 | LSLPhantom = phantom | volumedtc, |
64 | PrimsNonPhantom = nonphysical | physical, | 64 | PrimsNonPhantom = nonphysical | physical, |
65 | PrimsNonPhantomAgents = nonphysical | physical | agent, | 65 | PrimsNonPhantomAgents = nonphysical | physical | agent, |
66 | 66 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 81de9ab..0db6fe3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -11381,7 +11381,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11381 | if (checkNonPhysical) | 11381 | if (checkNonPhysical) |
11382 | rayfilter |= RayFilterFlags.nonphysical; | 11382 | rayfilter |= RayFilterFlags.nonphysical; |
11383 | if (detectPhantom) | 11383 | if (detectPhantom) |
11384 | rayfilter |= RayFilterFlags.LSLPhanton; | 11384 | rayfilter |= RayFilterFlags.LSLPhantom; |
11385 | 11385 | ||
11386 | Vector3 direction = dir * ( 1/dist); | 11386 | Vector3 direction = dir * ( 1/dist); |
11387 | 11387 | ||