diff options
| author | Melanie | 2013-02-04 19:21:39 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-04 19:21:39 +0000 |
| commit | 7482ad1c22e44e03c1a36f1d67d862084c20dae6 (patch) | |
| tree | 9450dd7cbe79e1d34b6d0519d994b1fd16a253ed /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7482ad1c22e44e03c1a36f1d67d862084c20dae6.zip opensim-SC_OLD-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.gz opensim-SC_OLD-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.bz2 opensim-SC_OLD-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index fe418d3..20a70b4 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -47,7 +47,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 47 | public delegate void JointDeactivated(PhysicsJoint joint); | 47 | public delegate void JointDeactivated(PhysicsJoint joint); |
| 48 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" | 48 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" |
| 49 | 49 | ||
| 50 | public enum RayFilterFlags:ushort | 50 | public enum RayFilterFlags : ushort |
| 51 | { | 51 | { |
| 52 | // the flags | 52 | // the flags |
| 53 | water = 0x01, | 53 | water = 0x01, |
| @@ -64,7 +64,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 64 | ClosestHit = 0x8000, | 64 | ClosestHit = 0x8000, |
| 65 | 65 | ||
| 66 | // some combinations | 66 | // some combinations |
| 67 | LSLPhanton = phantom | volumedtc, | 67 | LSLPhantom = phantom | volumedtc, |
| 68 | PrimsNonPhantom = nonphysical | physical, | 68 | PrimsNonPhantom = nonphysical | physical, |
| 69 | PrimsNonPhantomAgents = nonphysical | physical | agent, | 69 | PrimsNonPhantomAgents = nonphysical | physical | agent, |
| 70 | 70 | ||