From 996a6c2eeacf25456d2ffc12e59c34240cf8a578 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:34:28 +0000
Subject: After previous discussion, put eye-catcher 'SCRIPT READY' messages to
console rather than log as warning
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4ab6908..566772d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers
TimeSpan timeTaken = DateTime.Now - m_startuptime;
- m_log.InfoFormat(
- "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.",
+ MainConsole.Instance.OutputFormat(
+ "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.",
timeTaken.Minutes, timeTaken.Seconds);
}
--
cgit v1.1
From 957449e62cda67a641162043e21cd102f6f99080 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 9 Dec 2013 03:15:40 -0500
Subject: ParseNotecardToList() returned data past end of notecard text (mantis
#6881).
---
OpenSim/Framework/SLUtil.cs | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index 537de7a..cb73e8f 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -247,12 +247,18 @@ namespace OpenSim.Framework
///
public static List ParseNotecardToList(string rawInput)
{
- string[] input = rawInput.Replace("\r", "").Split('\n');
+ string[] input;
int idx = 0;
int level = 0;
List output = new List();
string[] words;
+ //The Linden format always ends with a } after the input data.
+ //Strip off trailing } so there is nothing after the input data.
+ int i = rawInput.LastIndexOf("}");
+ rawInput = rawInput.Remove(i, rawInput.Length-i);
+ input = rawInput.Replace("\r", "").Split('\n');
+
while (idx < input.Length)
{
if (input[idx] == "{")
@@ -287,24 +293,18 @@ namespace OpenSim.Framework
break;
if (words[0] == "Text")
{
- int len = int.Parse(words[2]);
- idx++;
+ idx++; //Now points to first line of notecard text
- int count = -1;
+ //Number of lines in notecard.
+ int lines = input.Length - idx;
+ int line = 0;
- while (count < len && idx < input.Length)
+ while (line < lines)
{
- // int l = input[idx].Length;
- string ln = input[idx];
-
- int need = len-count-1;
- if (ln.Length > need)
- ln = ln.Substring(0, need);
-
-// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
- output.Add(ln);
- count += ln.Length + 1;
+// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", input[idx]);
+ output.Add(input[idx]);
idx++;
+ line++;
}
return output;
--
cgit v1.1
From 6869633d76b2a6664743a608e4284b8dd7df85a6 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 28 Dec 2013 06:58:15 -0800
Subject: Add serialization/deserialization of region size to RegionInfo,
GridRegion, and RegionData. This does not modify interfaces or handling of
variable sized regions. This only enables the loading and storing of the
region size and the reporting of the region size in grid service responses.
The database tables already have the code to load and store the region size.
---
OpenSim/Framework/Constants.cs | 6 ++
OpenSim/Framework/RegionInfo.cs | 189 ++++++++++++++++++++++++++++++++--------
2 files changed, 158 insertions(+), 37 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index a2eb5ee..3468cea 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -30,8 +30,14 @@ namespace OpenSim.Framework
{
public class Constants
{
+ // 'RegionSize' is the legacy region size.
+ // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not
+ // be the legacy region size.
public const uint RegionSize = 256;
public const uint RegionHeight = 4096;
+ // This could be a parameters but, really, a region of greater than this is pretty unmanageable
+ public const uint MaximumRegionSize = 8192;
+
public const byte TerrainPatchSize = 16;
public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 24b9c89..857c151 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Framework
public class RegionInfo
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly string LogHeader = "[REGION INFO]";
public bool commFailTF = false;
public ConfigurationMember configMember;
@@ -137,16 +138,20 @@ namespace OpenSim.Framework
public bool m_allow_alternate_ports;
protected string m_externalHostName;
protected IPEndPoint m_internalEndPoint;
- protected uint? m_regionLocX;
- protected uint? m_regionLocY;
protected uint m_remotingPort;
public UUID RegionID = UUID.Zero;
public string RemotingAddress;
public UUID ScopeID = UUID.Zero;
private UUID m_maptileStaticUUID = UUID.Zero;
- private Dictionary m_otherSettings = new Dictionary();
+ public uint WorldLocX = 0;
+ public uint WorldLocY = 0;
+ public uint WorldLocZ = 0;
+ public uint RegionSizeX = Constants.RegionSize;
+ public uint RegionSizeY = Constants.RegionSize;
+ public uint RegionSizeZ = Constants.RegionHeight;
+ private Dictionary m_otherSettings = new Dictionary();
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -229,11 +234,10 @@ namespace OpenSim.Framework
m_serverURI = string.Empty;
}
- public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
+ public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri)
{
- m_regionLocX = regionLocX;
- m_regionLocY = regionLocY;
-
+ RegionLocX = legacyRegionLocX;
+ RegionLocY = legacyRegionLocY;
m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri;
m_serverURI = string.Empty;
@@ -447,25 +451,42 @@ namespace OpenSim.Framework
///
/// The x co-ordinate of this region in map tiles (e.g. 1000).
+ /// Coordinate is scaled as world coordinates divided by the legacy region size
+ /// and is thus is the number of legacy regions.
///
public uint RegionLocX
{
- get { return m_regionLocX.Value; }
- set { m_regionLocX = value; }
+ get { return WorldLocX / Constants.RegionSize; }
+ set { WorldLocX = value * Constants.RegionSize; }
}
///
/// The y co-ordinate of this region in map tiles (e.g. 1000).
+ /// Coordinate is scaled as world coordinates divided by the legacy region size
+ /// and is thus is the number of legacy regions.
///
public uint RegionLocY
{
- get { return m_regionLocY.Value; }
- set { m_regionLocY = value; }
+ get { return WorldLocY / Constants.RegionSize; }
+ set { WorldLocY = value * Constants.RegionSize; }
+ }
+
+ public void SetDefaultRegionSize()
+ {
+ WorldLocX = 0;
+ WorldLocY = 0;
+ WorldLocZ = 0;
+ RegionSizeX = Constants.RegionSize;
+ RegionSizeY = Constants.RegionSize;
+ RegionSizeZ = Constants.RegionHeight;
}
+ // A unique region handle is created from the region's world coordinates.
+ // This cannot be changed because some code expects to receive the region handle and then
+ // compute the region coordinates from it.
public ulong RegionHandle
{
- get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
+ get { return Util.UIntsToLong(WorldLocX, WorldLocY); }
}
public void SetEndPoint(string ipaddr, int port)
@@ -572,8 +593,25 @@ namespace OpenSim.Framework
string[] locationElements = location.Split(new char[] {','});
- m_regionLocX = Convert.ToUInt32(locationElements[0]);
- m_regionLocY = Convert.ToUInt32(locationElements[1]);
+ RegionLocX = Convert.ToUInt32(locationElements[0]);
+ RegionLocY = Convert.ToUInt32(locationElements[1]);
+
+ // Region size
+ // Default to legacy region size if not specified.
+ allKeys.Remove("SizeX");
+ string configSizeX = config.GetString("SizeX", Constants.RegionSize.ToString());
+ config.Set("SizeX", configSizeX);
+ RegionSizeX = Convert.ToUInt32(configSizeX);
+ allKeys.Remove("SizeY");
+ string configSizeY = config.GetString("SizeY", Constants.RegionSize.ToString());
+ config.Set("SizeY", configSizeX);
+ RegionSizeY = Convert.ToUInt32(configSizeY);
+ allKeys.Remove("SizeZ");
+ string configSizeZ = config.GetString("SizeZ", Constants.RegionHeight.ToString());
+ config.Set("SizeZ", configSizeX);
+ RegionSizeZ = Convert.ToUInt32(configSizeZ);
+
+ DoRegionSizeSanityChecks();
// InternalAddress
//
@@ -693,6 +731,57 @@ namespace OpenSim.Framework
}
}
+ // Make sure user specified region sizes are sane.
+ // Must be multiples of legacy region size (256).
+ private void DoRegionSizeSanityChecks()
+ {
+ if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
+ {
+ // Doing non-legacy region sizes.
+ // Enforce region size to be multiples of the legacy region size (256)
+ uint partial = RegionSizeX % Constants.RegionSize;
+ if (partial != 0)
+ {
+ RegionSizeX -= partial;
+ if (RegionSizeX == 0)
+ RegionSizeX = Constants.RegionSize;
+ m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeX={3} instead of specified {4}",
+ LogHeader, Constants.RegionSize, m_regionName, RegionSizeX, RegionSizeX + partial);
+ }
+ partial = RegionSizeY % Constants.RegionSize;
+ if (partial != 0)
+ {
+ RegionSizeY -= partial;
+ if (RegionSizeY == 0)
+ RegionSizeY = Constants.RegionSize;
+ m_log.ErrorFormat("{0} Region size must be multiple of {1}. Enforcing {2}.RegionSizeY={3} instead of specified {4}",
+ LogHeader, Constants.RegionSize, m_regionName, RegionSizeY, RegionSizeY + partial);
+ }
+
+ // Because of things in the viewer, regions MUST be square.
+ // Remove this check when viewers have been updated.
+ if (RegionSizeX != RegionSizeY)
+ {
+ uint minSize = Math.Min(RegionSizeX, RegionSizeY);
+ RegionSizeX = minSize;
+ RegionSizeY = minSize;
+ m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>",
+ LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+ }
+
+ // There is a practical limit to region size.
+ if (RegionSizeX > Constants.MaximumRegionSize || RegionSizeY > Constants.MaximumRegionSize)
+ {
+ RegionSizeX = Util.Clamp(RegionSizeX, Constants.RegionSize, Constants.MaximumRegionSize);
+ RegionSizeY = Util.Clamp(RegionSizeY, Constants.RegionSize, Constants.MaximumRegionSize);
+ m_log.ErrorFormat("{0} Region dimensions must be less than {1}. Clamping {2}'s size to <{3},{4}>",
+ LogHeader, Constants.MaximumRegionSize, m_regionName, RegionSizeX, RegionSizeY);
+ }
+
+ m_log.InfoFormat("{0} Region {1} size set to <{2},{3}>", LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+ }
+ }
+
private void WriteNiniConfig(IConfigSource source)
{
IConfig config = source.Configs[RegionName];
@@ -704,9 +793,16 @@ namespace OpenSim.Framework
config.Set("RegionUUID", RegionID.ToString());
- string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
+ string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
config.Set("Location", location);
+ if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
+ {
+ config.Set("SizeX", RegionSizeX);
+ config.Set("SizeY", RegionSizeY);
+ config.Set("SizeZ", RegionSizeZ);
+ }
+
config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
config.Set("InternalPort", m_internalEndPoint.Port);
@@ -789,10 +885,18 @@ namespace OpenSim.Framework
RegionID.ToString(), true);
configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Region Name", RegionName, true);
+
configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
- "Grid Location (X Axis)", m_regionLocX.ToString(), true);
+ "Grid Location (X Axis)", RegionLocX.ToString(), true);
configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
- "Grid Location (Y Axis)", m_regionLocY.ToString(), true);
+ "Grid Location (Y Axis)", RegionLocY.ToString(), true);
+ configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in X dimension", RegionSizeX.ToString(), true);
+ configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in Y dimension", RegionSizeY.ToString(), true);
+ configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in Z dimension", RegionSizeZ.ToString(), true);
+
//m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
configMember.addConfigurationOption("internal_ip_address",
ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
@@ -855,10 +959,18 @@ namespace OpenSim.Framework
UUID.Random().ToString(), true);
configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Region Name", "OpenSim Test", false);
+
configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Grid Location (X Axis)", "1000", false);
configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Grid Location (Y Axis)", "1000", false);
+ configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in X dimension", Constants.RegionSize.ToString(), false);
+ configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in Y dimension", Constants.RegionSize.ToString(), false);
+ configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+ "Size of region in Z dimension", Constants.RegionHeight.ToString(), false);
+
//m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
configMember.addConfigurationOption("internal_ip_address",
ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
@@ -916,10 +1028,19 @@ namespace OpenSim.Framework
RegionName = (string) configuration_result;
break;
case "sim_location_x":
- m_regionLocX = (uint) configuration_result;
+ RegionLocX = (uint) configuration_result;
break;
case "sim_location_y":
- m_regionLocY = (uint) configuration_result;
+ RegionLocY = (uint) configuration_result;
+ break;
+ case "sim_size_x":
+ RegionSizeX = (uint) configuration_result;
+ break;
+ case "sim_size_y":
+ RegionSizeY = (uint) configuration_result;
+ break;
+ case "sim_size_z":
+ RegionSizeZ = (uint) configuration_result;
break;
case "internal_ip_address":
IPAddress address = (IPAddress) configuration_result;
@@ -1000,8 +1121,13 @@ namespace OpenSim.Framework
args["external_host_name"] = OSD.FromString(ExternalHostName);
args["http_port"] = OSD.FromString(HttpPort.ToString());
args["server_uri"] = OSD.FromString(ServerURI);
+
args["region_xloc"] = OSD.FromString(RegionLocX.ToString());
args["region_yloc"] = OSD.FromString(RegionLocY.ToString());
+ args["region_size_x"] = OSD.FromString(RegionSizeX.ToString());
+ args["region_size_y"] = OSD.FromString(RegionSizeY.ToString());
+ args["region_size_z"] = OSD.FromString(RegionSizeZ.ToString());
+
args["internal_ep_address"] = OSD.FromString(InternalEndPoint.Address.ToString());
args["internal_ep_port"] = OSD.FromString(InternalEndPoint.Port.ToString());
if ((RemotingAddress != null) && !RemotingAddress.Equals(""))
@@ -1040,6 +1166,13 @@ namespace OpenSim.Framework
UInt32.TryParse(args["region_yloc"].AsString(), out locy);
RegionLocY = locy;
}
+ if (args.ContainsKey("region_size_x"))
+ RegionSizeX = (uint)args["region_size_x"].AsInteger();
+ if (args.ContainsKey("region_size_y"))
+ RegionSizeY = (uint)args["region_size_y"].AsInteger();
+ if (args.ContainsKey("region_size_z"))
+ RegionSizeZ = (uint)args["region_size_z"].AsInteger();
+
IPAddress ip_addr = null;
if (args["internal_ep_address"] != null)
{
@@ -1076,23 +1209,5 @@ namespace OpenSim.Framework
regionInfo.ServerURI = serverURI;
return regionInfo;
}
-
- public Dictionary ToKeyValuePairs()
- {
- Dictionary kvp = new Dictionary();
- kvp["uuid"] = RegionID.ToString();
- kvp["locX"] = RegionLocX.ToString();
- kvp["locY"] = RegionLocY.ToString();
- kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
- kvp["external_port"] = ExternalEndPoint.Port.ToString();
- kvp["external_host_name"] = ExternalHostName;
- kvp["http_port"] = HttpPort.ToString();
- kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
- kvp["internal_port"] = InternalEndPoint.Port.ToString();
- kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
- kvp["server_uri"] = ServerURI;
-
- return kvp;
- }
}
}
--
cgit v1.1
From d9848943a96672b14fb9a6be58c4adc1e1552f3c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 4 Jan 2014 10:39:05 -0800
Subject: Add routines in Util.cs for conversion of region handles to region
locations and for the conversion of region world location to region 'region'
location. These routines will replace all the arithmatic scattered throughout
OpenSimulator.
---
OpenSim/Framework/Constants.cs | 5 ++++-
OpenSim/Framework/Util.cs | 43 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 3468cea..3ba264c 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -38,7 +38,10 @@ namespace OpenSim.Framework
// This could be a parameters but, really, a region of greater than this is pretty unmanageable
public const uint MaximumRegionSize = 8192;
- public const byte TerrainPatchSize = 16;
+ // Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum
+ public const int MinRegionSize = 16;
+ public const int TerrainPatchSize = 16;
+
public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
public enum EstateAccessCodex : uint
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e8dfec1..b84673b 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -333,6 +333,49 @@ namespace OpenSim.Framework
return Utils.UIntsToLong(X, Y);
}
+ // Regions are identified with a 'handle' made up of its region coordinates packed into a ulong.
+ // Several places rely on the ability to extract a region's location from its handle.
+ // Note the location is in 'world coordinates' (see below).
+ // Region handles are based on the lowest coordinate of the region so trim the passed x,y to be the regions 0,0.
+ public static ulong RegionWorldLocToHandle(uint X, uint Y)
+ {
+ return Utils.UIntsToLong(X, Y);
+ }
+
+ public static ulong RegionLocToHandle(uint X, uint Y)
+ {
+ return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y));
+ }
+
+ public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
+ {
+ X = (uint)(handle >> 32);
+ Y = (uint)(handle & (ulong)uint.MaxValue);
+ }
+
+ public static void RegionHandleToRegionLoc(ulong handle, out uint X, out uint Y)
+ {
+ uint worldX, worldY;
+ RegionHandleToWorldLoc(handle, out worldX, out worldY);
+ X = WorldToRegionLoc(worldX);
+ Y = WorldToRegionLoc(worldY);
+ }
+
+ // A region location can be 'world coordinates' (meters from zero) or 'region coordinates'
+ // (number of regions from zero). This measurement of regions relies on the legacy 256 region size.
+ // These routines exist to make what is being converted explicit so the next person knows what was meant.
+ // Convert a region's 'world coordinate' to its 'region coordinate'.
+ public static uint WorldToRegionLoc(uint worldCoord)
+ {
+ return worldCoord / Constants.RegionSize;
+ }
+
+ // Convert a region's 'region coordinate' to its 'world coordinate'.
+ public static uint RegionToWorldLoc(uint regionCoord)
+ {
+ return regionCoord * Constants.RegionSize;
+ }
+
public static T Clamp(T x, T min, T max)
where T : IComparable
{
--
cgit v1.1
From 7e32313a491defe8f5fb62ce0036c1692d4b4af9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 3 Jan 2014 07:41:06 -0800
Subject: varregion: Add region size to teleport event messages
(EnableSimulator, CorssRegion, TeleportFinishEvent). Have Simian grid service
return the region size. Many teleport related debug log messages. Can be
removed when teleport works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
---
OpenSim/Framework/RegionInfo.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 857c151..1de30af 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -238,6 +238,8 @@ namespace OpenSim.Framework
{
RegionLocX = legacyRegionLocX;
RegionLocY = legacyRegionLocY;
+ RegionSizeX = Constants.RegionSize;
+ RegionSizeY = Constants.RegionSize;
m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri;
m_serverURI = string.Empty;
--
cgit v1.1