aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
diff options
context:
space:
mode:
authorRobert Adams2013-10-02 16:57:02 -0700
committerRobert Adams2013-10-07 13:57:30 -0700
commit25ae59b9ebf71d39d2ff5237b791f2599f4fa082 (patch)
tree2a7a96da851cc236e1c5842301d08ed852c24f65 /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
parentvarregion: add new TerrainData and TerrainCompressor routines. TerrainCompres... (diff)
downloadopensim-SC-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.zip
opensim-SC-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.gz
opensim-SC-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.bz2
opensim-SC-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.xz
varregion: remove scattered use of Constants.RegionSize by having routines reference RegionInfo.RegionWorldLoc?.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 4616170..7bc5e51 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -180,8 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
180 string message = c.Message; 180 string message = c.Message;
181 Scene scene = (Scene)c.Scene; 181 Scene scene = (Scene)c.Scene;
182 Vector3 fromPos = c.Position; 182 Vector3 fromPos = c.Position;
183 Vector3 regionPos = new Vector3(scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize, 183 Vector3 regionPos = new Vector3(scene.RegionInfo.RegionWorldLocX, scene.RegionInfo.RegionWorldLocY, 0);
184 scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize, 0);
185 184
186 if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; 185 if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
187 186
@@ -333,8 +332,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
333 { 332 {
334 Vector3 fromRegionPos = fromPos + regionPos; 333 Vector3 fromRegionPos = fromPos + regionPos;
335 Vector3 toRegionPos = presence.AbsolutePosition + 334 Vector3 toRegionPos = presence.AbsolutePosition +
336 new Vector3(presence.Scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize, 335 new Vector3(presence.Scene.RegionInfo.RegionWorldLocX, presence.Scene.RegionInfo.RegionWorldLocY, 0);
337 presence.Scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize, 0);
338 336
339 int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); 337 int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
340 338