diff options
author | Robert Adams | 2013-09-19 12:14:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-28 07:33:52 -0700 |
commit | 317c04fe1714631d851684e3bb294f02056bcd07 (patch) | |
tree | a4e935d869c9cb2d79f545f9b6dd1f73b01a7053 /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |
parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
download | opensim-SC-317c04fe1714631d851684e3bb294f02056bcd07.zip opensim-SC-317c04fe1714631d851684e3bb294f02056bcd07.tar.gz opensim-SC-317c04fe1714631d851684e3bb294f02056bcd07.tar.bz2 opensim-SC-317c04fe1714631d851684e3bb294f02056bcd07.tar.xz |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 5229c08..4616170 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -180,8 +180,8 @@ 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.RegionLocX * Constants.RegionSize, | 183 | Vector3 regionPos = new Vector3(scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize, |
184 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 184 | scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize, 0); |
185 | 185 | ||
186 | if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; | 186 | if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; |
187 | 187 | ||
@@ -333,8 +333,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
333 | { | 333 | { |
334 | Vector3 fromRegionPos = fromPos + regionPos; | 334 | Vector3 fromRegionPos = fromPos + regionPos; |
335 | Vector3 toRegionPos = presence.AbsolutePosition + | 335 | Vector3 toRegionPos = presence.AbsolutePosition + |
336 | new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize, | 336 | new Vector3(presence.Scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize, |
337 | presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 337 | presence.Scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize, 0); |
338 | 338 | ||
339 | int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); | 339 | int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); |
340 | 340 | ||