4 files changed, 37 insertions, 16 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 618f425..7bf0a99 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2865,22 +2865,28 @@ namespace OpenSim.Region.Framework.Scenes
         {
             lock (m_syncRoot)
             {
-                if (m_physicsActor != null)
-                {
-                    if (!IsChildAgent)
-                    {
-                        // This may seem like it's redundant, remove the avatar from the physics scene
-                        // just to add it back again, but it saves us from having to update
-                        // 3 variables 10 times a second.
-                        bool flyingTemp = m_physicsActor.Flying;
-                        RemoveFromPhysicalScene();
-                        //m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
-
-                        //PhysicsActor = null;
-
-                        AddToPhysicalScene(flyingTemp);
-                    }
-                }
+// MT: Commented this because it's no longer needed.
+// It used to be that the avatar height was calculated from the visual
+// params, so any call to this method could change the physical actor's
+// height. Now the height is supplied in the agent circuit data and never
+// changes here. So, we can leave physics alone.
+//
+//                if (m_physicsActor != null)
+//                {
+//                    if (!IsChildAgent)
+//                    {
+//                        // This may seem like it's redundant, remove the avatar from the physics scene
+//                        // just to add it back again, but it saves us from having to update
+//                        // 3 variables 10 times a second.
+//                        bool flyingTemp = m_physicsActor.Flying;
+//                        RemoveFromPhysicalScene();
+//                        //m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
+//
+//                        //PhysicsActor = null;
+//
+//                        AddToPhysicalScene(flyingTemp);
+//                    }
+//                }
 
                 #region Bake Cache Check
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1b11f2c..2527757 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10777,6 +10777,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return GetLinkPrimitiveParams(obj, rules);
         }
+
+        public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
+        {
+            List<SceneObjectPart> parts = GetLinkParts(link);
+            if (parts.Count < 1)
+                return 0;
+
+            return GetNumberOfSides(parts[0]);
+        }
     }
 
     public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 561e3b3..bae7d4b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Vector llWind(LSL_Vector offset);
         LSL_String llXorBase64Strings(string str1, string str2);
         LSL_String llXorBase64StringsCorrect(string str1, string str2);
+       LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
 
         void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
         LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index f14967e..7c26824 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1849,5 +1849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llClearPrimMedia(face);
         }
+
+        public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
+        {
+            return  m_LSL_Functions.llGetLinkNumberOfSides(link);
+        }
     }
 }