diff options
author | Robert Adams | 2013-12-14 07:53:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-14 07:53:01 -0800 |
commit | 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch) | |
tree | 1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/ApplicationPlugins/LoadRegions | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz |
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 74a7a50..1d63d26 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -184,11 +184,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
184 | return false; | 184 | return false; |
185 | } | 185 | } |
186 | else if ( | 186 | else if ( |
187 | regions[i].LegacyRegionLocX == regions[j].LegacyRegionLocX && regions[i].LegacyRegionLocY == regions[j].LegacyRegionLocY) | 187 | regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY) |
188 | { | 188 | { |
189 | m_log.ErrorFormat( | 189 | m_log.ErrorFormat( |
190 | "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})", | 190 | "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})", |
191 | regions[i].RegionName, regions[j].RegionName, regions[i].LegacyRegionLocX, regions[i].LegacyRegionLocY); | 191 | regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY); |
192 | return false; | 192 | return false; |
193 | } | 193 | } |
194 | else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port) | 194 | else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port) |