aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorlbsa712007-09-27 14:57:43 +0000
committerlbsa712007-09-27 14:57:43 +0000
commit863195612bdef56165f2b4354bab280c371618b9 (patch)
tree63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Region/Environment
parentrevert change to libsecondlife.dll.config which breaks Linux (diff)
downloadopensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2
opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
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
162 avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId); 162 avatar = m_scene.GetScenePresence(presence.ControllingClient.AgentId);
163 if (avatar != null) 163 if (avatar != null)
164 { 164 {
165 dis = (int)LLVector3.Mag(avatar.AbsolutePosition-fromPos); 165 dis = (int) avatar.AbsolutePosition.GetDistanceTo(fromPos);
166 } 166 }
167 167
168 switch (type) 168 switch (type)
@@ -211,4 +211,4 @@ namespace OpenSim.Region.Environment.Modules
211 } 211 }
212 } 212 }
213 } 213 }
214} 214} \ 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
561 } 561 }
562 562
563 /// check for physics-related movement 563 /// check for physics-related movement
564 else if (LLVector3.Dist(lastPhysPos,AbsolutePosition) > 0.02) 564 else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02)
565 { 565 {
566 SendTerseUpdateToAllClients(); 566 SendTerseUpdateToAllClients();
567 m_updateCount = 0; 567 m_updateCount = 0;
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes
748 748
749 protected void CheckForSignificantMovement() 749 protected void CheckForSignificantMovement()
750 { 750 {
751 if (LLVector3.Dist(AbsolutePosition, posLastSignificantMove) > 2.0) 751 if (Helpers.VecDist(AbsolutePosition, posLastSignificantMove) > 2.0)
752 { 752 {
753 posLastSignificantMove = AbsolutePosition; 753 posLastSignificantMove = AbsolutePosition;
754 if (OnSignificantClientMovement != null) 754 if (OnSignificantClientMovement != null)
@@ -919,4 +919,4 @@ namespace OpenSim.Region.Environment.Scenes
919 RemoveFromPhysicalScene(); 919 RemoveFromPhysicalScene();
920 } 920 }
921 } 921 }
922} 922} \ No newline at end of file