From f2c78281ce46ff1be96f0bf86f2b7ddefd94a900 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 1 Oct 2012 12:10:06 -0700
Subject: BulletSim: fix the FloatOnWater code so avatars can normally go
 underwater.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 5cf8953..2fe4d68 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -234,7 +234,7 @@ public class BSCharacter : BSPhysObject
             _position.Z = terrainHeight + 2.0f;
             ret = true;
         }
-        if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) == 0)
+        if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
             float waterHeight = PhysicsScene.GetWaterLevelAtXYZ(_position);
             if (Position.Z < waterHeight)
-- 
cgit v1.1