diff options
author | lbsa71 | 2007-09-27 13:25:45 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 13:25:45 +0000 |
commit | 8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch) | |
tree | ae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Region/Environment | |
parent | Terrain: (diff) | |
download | opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2 opensim-SC-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz |
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ChatModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index 1c7b806..d76ffe3 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) avatar.AbsolutePosition.GetDistanceTo(fromPos); | 165 | dis = (int)LLVector3.Mag(avatar.AbsolutePosition-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 | } \ No newline at end of file | 214 | } |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index e6b8364..5b6fe46 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 (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02) | 564 | else if (LLVector3.Dist(lastPhysPos,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 (Helpers.VecDist(AbsolutePosition, posLastSignificantMove) > 2.0) | 751 | if (LLVector3.Dist(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 | } \ No newline at end of file | 922 | } |