diff options
| author | Melanie | 2011-10-25 02:55:14 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:55:14 +0100 |
| commit | 43751d0cfdcb4ccb5789ad02f67fde628a4a7a59 (patch) | |
| tree | 5bac78190520b06a65a128225aa1ea72900e2e45 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge (diff) | |
| parent | minor: method doc to explain a lock of OdeLock (diff) | |
| download | opensim-SC-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.zip opensim-SC-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.gz opensim-SC-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.bz2 opensim-SC-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.xz | |
Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 03ff6d8..9b503fc 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -3679,8 +3679,8 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
| 3679 | { | 3679 | { |
| 3680 | d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water)); | 3680 | d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water)); |
| 3681 | d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space)); | 3681 | d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space)); |
| 3682 | |||
| 3683 | } | 3682 | } |
| 3683 | |||
| 3684 | geom_name_map[WaterGeom] = "Water"; | 3684 | geom_name_map[WaterGeom] = "Water"; |
| 3685 | 3685 | ||
| 3686 | d.Matrix3 R = new d.Matrix3(); | 3686 | d.Matrix3 R = new d.Matrix3(); |