diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
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 228eca9..37daf46 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -1525,7 +1525,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1525 | chr.CollidingGround = false; | 1525 | chr.CollidingGround = false; |
| 1526 | chr.CollidingObj = false; | 1526 | chr.CollidingObj = false; |
| 1527 | 1527 | ||
| 1528 | // test the avatar's geometry for collision with the space | 1528 | // Test the avatar's geometry for collision with the space |
| 1529 | // This will return near and the space that they are the closest to | 1529 | // This will return near and the space that they are the closest to |
| 1530 | // And we'll run this again against the avatar and the space segment | 1530 | // And we'll run this again against the avatar and the space segment |
| 1531 | // This will return with a bunch of possible objects in the space segment | 1531 | // This will return with a bunch of possible objects in the space segment |