From 5adafd538ae98073127f890d8a3db13745e6b716 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sat, 20 Oct 2007 00:09:07 +0000
Subject: * Fixed an issue whereby avatar chat distances were being calculated
 against the region corner due to a zero vector. * Bonus Commit: Fixed the
 Raster class in libTerrain.

---
 OpenSim/Region/Environment/Modules/ChatModule.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/ChatModule.cs')

diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index a438ae6..e1a591b 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -217,7 +217,8 @@ namespace OpenSim.Region.Environment.Modules
 
             if (avatar != null)
             {
-                fromPos = avatar.AbsolutePosition;
+                fromPos = avatar.AbsolutePosition;
+                fromRegionPos = fromPos + new LLVector3(e.Scene.RegionInfo.RegionLocX * 256, e.Scene.RegionInfo.RegionLocY * 256, 0);
                 fromName = avatar.Firstname + " " + avatar.Lastname;
                 fromAgentID = e.Sender.AgentId;
                 avatar = null;
@@ -271,12 +272,12 @@ namespace OpenSim.Region.Environment.Modules
                                                          int dis = -100000;
 
                                                          LLVector3 avatarRegionPos = presence.AbsolutePosition + new LLVector3(scene.RegionInfo.RegionLocX * 256, scene.RegionInfo.RegionLocY * 256, 0);
-                                                         dis = (int)avatarRegionPos.GetDistanceTo(fromRegionPos);
+                                                         dis = Math.Abs((int)avatarRegionPos.GetDistanceTo(fromRegionPos));
 
                                                          switch (e.Type)
                                                          {
                                                              case ChatTypeEnum.Whisper:
-                                                                 if ((dis < m_whisperdistance) && (dis > -m_whisperdistance))
+                                                                 if (dis < m_whisperdistance)
                                                                  {
                                                                      //should change so the message is sent through the avatar rather than direct to the ClientView
                                                                      presence.ControllingClient.SendChatMessage(message,
@@ -286,8 +287,9 @@ namespace OpenSim.Region.Environment.Modules
                                                                                                                 fromAgentID);
                                                                  }
                                                                  break;
+                                                             default:
                                                              case ChatTypeEnum.Say:
-                                                                 if ((dis < m_saydistance) && (dis > -m_saydistance))
+                                                                 if (dis < m_saydistance)
                                                                  {
                                                                      //Console.WriteLine("sending chat");
                                                                      presence.ControllingClient.SendChatMessage(message,
@@ -298,7 +300,7 @@ namespace OpenSim.Region.Environment.Modules
                                                                  }
                                                                  break;
                                                              case ChatTypeEnum.Shout:
-                                                                 if ((dis < m_shoutdistance) && (dis > -m_shoutdistance))
+                                                                 if (dis < m_shoutdistance)
                                                                  {
                                                                      presence.ControllingClient.SendChatMessage(message,
                                                                                                                 type,
-- 
cgit v1.1