diff options
| author | Robert Adams | 2013-10-02 16:59:37 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-07 13:57:40 -0700 |
| commit | 7416809077227f35ab70ed44060e51f2bcf66937 (patch) | |
| tree | 7578cbfed07777d5c60af986791dc7d8b09b2cd5 /OpenSim/Services | |
| parent | varregion: remove scattered use of Constants.RegionSize by having routines re... (diff) | |
| download | opensim-SC_OLD-7416809077227f35ab70ed44060e51f2bcf66937.zip opensim-SC_OLD-7416809077227f35ab70ed44060e51f2bcf66937.tar.gz opensim-SC_OLD-7416809077227f35ab70ed44060e51f2bcf66937.tar.bz2 opensim-SC_OLD-7416809077227f35ab70ed44060e51f2bcf66937.tar.xz | |
varregion: plug in TerrainData class and modify TerrainModule and LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 14b6d1a..56171b1 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -246,8 +246,8 @@ namespace OpenSim.Services.Interfaces | |||
| 246 | public GridRegion(RegionInfo ConvertFrom) | 246 | public GridRegion(RegionInfo ConvertFrom) |
| 247 | { | 247 | { |
| 248 | m_regionName = ConvertFrom.RegionName; | 248 | m_regionName = ConvertFrom.RegionName; |
| 249 | m_regionLocX = (int)(ConvertFrom.LegacyRegionLocX * Constants.RegionSize); | 249 | m_regionLocX = (int)(ConvertFrom.RegionWorldLocX); |
| 250 | m_regionLocY = (int)(ConvertFrom.LegacyRegionLocY * Constants.RegionSize); | 250 | m_regionLocY = (int)(ConvertFrom.RegionWorldLocY); |
| 251 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 251 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
| 252 | m_externalHostName = ConvertFrom.ExternalHostName; | 252 | m_externalHostName = ConvertFrom.ExternalHostName; |
| 253 | m_httpPort = ConvertFrom.HttpPort; | 253 | m_httpPort = ConvertFrom.HttpPort; |