ODEPlugin

* Added osSetPrimFloatOnWater(BOOL) to make Physical prim float at the water level.   
* osSetPrimFloatOnWater(TRUE); or osSetPrimFloatOnWater(FALSE);
* By default, prim do not float at the water level.
* More work is needed on the floating, but it's a start.

3 files changed, 20 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 79a106b..05a1a1d 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1897,6 +1897,11 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_LSL_Functions.osSetParcelMediaURL(url);
         }
 
+        public void osSetPrimFloatOnWater(int floatYN)
+        {
+            m_LSL_Functions.osSetPrimFloatOnWater(floatYN);
+        }
+
         public double llList2Float(LSL_Types.list src, int index)
         {
             return m_LSL_Functions.llList2Float(src, index);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 010961e..623ac29 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -1508,6 +1508,8 @@ namespace OpenSim.Region.ScriptEngine.Common
             }
         }
 
+         
+
         public void llSetHoverHeight(double height, int water, double tau)
         {
             m_host.AddScriptLPS(1);
@@ -4405,6 +4407,18 @@ namespace OpenSim.Region.ScriptEngine.Common
             return false;
         }
 
+        public void osSetPrimFloatOnWater(int floatYN)
+        {
+            m_host.AddScriptLPS(1);
+            if (m_host.ParentGroup != null)
+            {
+                if (m_host.ParentGroup.RootPart != null)
+                {
+                    m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
+                }
+            }
+        }
+
         private void NotImplemented(string command)
         {
             m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index d60d70e..381ca62 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -648,6 +648,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         void osRegionNotice(string msg);
             bool osConsoleCommand(string Command);
         void osSetParcelMediaURL(string url);
+        void osSetPrimFloatOnWater(int floatYN);
 
     }
 }