diff options
| author | teravus | 2013-02-03 08:14:47 -0500 |
|---|---|---|
| committer | teravus | 2013-02-03 08:14:47 -0500 |
| commit | 8fd99ecab14c06ef61b8e6d8c5a3a1452669639b (patch) | |
| tree | 0ef3d872a7f7a72941f7aebb5d15042681ff6697 /OpenSim/Region/Physics | |
| parent | Adds the ability to load more then one IClientNetworkServer thereby allowing ... (diff) | |
| parent | Merge /home/opensim/src/opensim (diff) | |
| download | opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.zip opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.gz opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.bz2 opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.xz | |
Merge branch 'master' of ssh://opensim/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 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 | ||