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/Services | |
| parent | Merge branch 'master' into varregion (diff) | |
| download | opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs index 71334ee..b999509 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | |||
| @@ -201,8 +201,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 201 | NameValueCollection requestArgs = new NameValueCollection | 201 | NameValueCollection requestArgs = new NameValueCollection |
| 202 | { | 202 | { |
| 203 | { "RequestMethod", "xAddMapTile" }, | 203 | { "RequestMethod", "xAddMapTile" }, |
| 204 | { "X", scene.RegionInfo.LegacyRegionLocX.ToString() }, | 204 | { "X", scene.RegionInfo.RegionLocX.ToString() }, |
| 205 | { "Y", scene.RegionInfo.LegacyRegionLocY.ToString() }, | 205 | { "Y", scene.RegionInfo.RegionLocY.ToString() }, |
| 206 | { "ContentType", "image/png" }, | 206 | { "ContentType", "image/png" }, |
| 207 | { "EncodedData", System.Convert.ToBase64String(pngData) } | 207 | { "EncodedData", System.Convert.ToBase64String(pngData) } |
| 208 | }; | 208 | }; |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index e1a3cef..df2b4d7 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -255,8 +255,8 @@ namespace OpenSim.Services.Interfaces | |||
| 255 | public GridRegion(RegionInfo ConvertFrom) | 255 | public GridRegion(RegionInfo ConvertFrom) |
| 256 | { | 256 | { |
| 257 | m_regionName = ConvertFrom.RegionName; | 257 | m_regionName = ConvertFrom.RegionName; |
| 258 | m_regionLocX = (int)(ConvertFrom.RegionWorldLocX); | 258 | m_regionLocX = (int)(ConvertFrom.WorldLocX); |
| 259 | m_regionLocY = (int)(ConvertFrom.RegionWorldLocY); | 259 | m_regionLocY = (int)(ConvertFrom.WorldLocY); |
| 260 | RegionSizeX = (int)ConvertFrom.RegionSizeX; | 260 | RegionSizeX = (int)ConvertFrom.RegionSizeX; |
| 261 | RegionSizeY = (int)ConvertFrom.RegionSizeY; | 261 | RegionSizeY = (int)ConvertFrom.RegionSizeY; |
| 262 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 262 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |