OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: go back to using Constants.RegionSize so as not to break 

external modules. People shouldn't use it but don't want to cause
too much breakage of legacy modules.
varregion
Robert Adams 2013-09-23 10:38:38 -07:00
parent 139639d25e
commit fa1c688342
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Framework/RegionInfo.cs
View File

@ -146,19 +146,12 @@ namespace OpenSim.Framework
public uint RegionWorldLocX = 0; public uint RegionWorldLocX = 0;
public uint RegionWorldLocY = 0; public uint RegionWorldLocY = 0;
public uint RegionWorldLocZ = 0; public uint RegionWorldLocZ = 0;
public uint RegionSizeX = LegacyRegionSize; public uint RegionSizeX = Constants.RegionSize;
public uint RegionSizeY = LegacyRegionSize; public uint RegionSizeY = Constants.RegionSize;
public uint RegionSizeZ = Constants.RegionHeight; public uint RegionSizeZ = Constants.RegionHeight;
private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>(); private Dictionary<String, String> m_otherSettings = new Dictionary<string, string>();
// Originally, regions were fixed size of 256 in X and Y.
// For downward compatability, 'RegionLocX' returns the region coordinates in the legacy region units.
// This is the constant used to convert world integer coordinates to legacy region units.
public const uint LegacyRegionSize = 256;
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote. // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
// MT: Yes. Estates can't span trust boundaries. Therefore, it can be // MT: Yes. Estates can't span trust boundaries. Therefore, it can be
@ -460,8 +453,8 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public uint LegacyRegionLocX public uint LegacyRegionLocX
{ {
get { return RegionWorldLocX / LegacyRegionSize; } get { return RegionWorldLocX / Constants.RegionSize; }
set { RegionWorldLocX = value * LegacyRegionSize; } set { RegionWorldLocX = value * Constants.RegionSize; }
} }
/// <summary> /// <summary>
@ -471,8 +464,8 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public uint LegacyRegionLocY public uint LegacyRegionLocY
{ {
get { return RegionWorldLocY / LegacyRegionSize; } get { return RegionWorldLocY / Constants.RegionSize; }
set { RegionWorldLocY = value * LegacyRegionSize; } set { RegionWorldLocY = value * Constants.RegionSize; }
} }
/// <summary> /// <summary>
@ -492,8 +485,8 @@ namespace OpenSim.Framework
RegionWorldLocX = 0; RegionWorldLocX = 0;
RegionWorldLocY = 0; RegionWorldLocY = 0;
RegionWorldLocZ = 0; RegionWorldLocZ = 0;
RegionSizeX = LegacyRegionSize; RegionSizeX = Constants.RegionSize;
RegionSizeY = LegacyRegionSize; RegionSizeY = Constants.RegionSize;
RegionSizeZ = Constants.RegionHeight; RegionSizeZ = Constants.RegionHeight;
} }
@ -628,11 +621,11 @@ namespace OpenSim.Framework
// Region size // Region size
// Default to legacy region size if not specified. // Default to legacy region size if not specified.
allKeys.Remove("SizeX"); allKeys.Remove("SizeX");
string configSizeX = config.GetString("SizeX", LegacyRegionSize.ToString()); string configSizeX = config.GetString("SizeX", Constants.RegionSize.ToString());
config.Set("SizeX", configSizeX); config.Set("SizeX", configSizeX);
RegionSizeX = Convert.ToUInt32(configSizeX); RegionSizeX = Convert.ToUInt32(configSizeX);
allKeys.Remove("SizeY"); allKeys.Remove("SizeY");
string configSizeY = config.GetString("SizeY", LegacyRegionSize.ToString()); string configSizeY = config.GetString("SizeY", Constants.RegionSize.ToString());
config.Set("SizeY", configSizeX); config.Set("SizeY", configSizeX);
RegionSizeY = Convert.ToUInt32(configSizeY); RegionSizeY = Convert.ToUInt32(configSizeY);
allKeys.Remove("SizeZ"); allKeys.Remove("SizeZ");
@ -772,7 +765,7 @@ namespace OpenSim.Framework
string location = String.Format("{0},{1}", LegacyRegionLocX, LegacyRegionLocY); string location = String.Format("{0},{1}", LegacyRegionLocX, LegacyRegionLocY);
config.Set("Location", location); config.Set("Location", location);
if (RegionSizeX != LegacyRegionSize || RegionSizeY != LegacyRegionSize) if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
{ {
config.Set("SizeX", RegionSizeX); config.Set("SizeX", RegionSizeX);
config.Set("SizeY", RegionSizeY); config.Set("SizeY", RegionSizeY);
@ -941,9 +934,9 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Grid Location (Y Axis)", "1000", false); "Grid Location (Y Axis)", "1000", false);
configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Size of region in X dimension", LegacyRegionSize.ToString(), false); "Size of region in X dimension", Constants.RegionSize.ToString(), false);
configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Size of region in Y dimension", LegacyRegionSize.ToString(), false); "Size of region in Y dimension", Constants.RegionSize.ToString(), false);
configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Size of region in Z dimension", Constants.RegionHeight.ToString(), false); "Size of region in Z dimension", Constants.RegionHeight.ToString(), false);