Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

2 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index d76ffe3..1c7b806 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules
                                                      avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId);

                                                      if (avatar != null)

                                                      {

-                                                         dis = (int)LLVector3.Mag(avatar.AbsolutePosition-fromPos);

+                                                         dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos);

                                                      }

 

                                                      switch (type)

@@ -211,4 +211,4 @@ namespace OpenSim.Region.Environment.Modules
             }

         }

     }

-}

+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5b6fe46..e6b8364 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -561,7 +561,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
                     /// check for physics-related movement
-                else if (LLVector3.Dist(lastPhysPos,AbsolutePosition) > 0.02)
+                else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02)
                 {
                     SendTerseUpdateToAllClients();
                     m_updateCount = 0;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected void CheckForSignificantMovement()
         {
-            if (LLVector3.Dist(AbsolutePosition, posLastSignificantMove) > 2.0)
+            if (Helpers.VecDist(AbsolutePosition, posLastSignificantMove) > 2.0)
             {
                 posLastSignificantMove = AbsolutePosition;
                 if (OnSignificantClientMovement != null)
@@ -919,4 +919,4 @@ namespace OpenSim.Region.Environment.Scenes
             RemoveFromPhysicalScene();
         }
     }
-}
+}
\ No newline at end of file