diff options
author | Robert Adams | 2014-01-03 07:41:06 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-03 07:41:06 -0800 |
commit | 9984ecf862ff7362b0caa6c55554c3fd2243873d (patch) | |
tree | 3b627cf01886371cc4a625916a3bc6297c4d23b8 /OpenSim/Framework | |
parent | varregion: extract banned region logic into a class for cleanlyness. (diff) | |
download | opensim-SC-9984ecf862ff7362b0caa6c55554c3fd2243873d.zip opensim-SC-9984ecf862ff7362b0caa6c55554c3fd2243873d.tar.gz opensim-SC-9984ecf862ff7362b0caa6c55554c3fd2243873d.tar.bz2 opensim-SC-9984ecf862ff7362b0caa6c55554c3fd2243873d.tar.xz |
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).
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Constants.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index d80808c..3ba264c 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
@@ -31,7 +31,7 @@ namespace OpenSim.Framework | |||
31 | public class Constants | 31 | public class Constants |
32 | { | 32 | { |
33 | // 'RegionSize' is the legacy region size. | 33 | // 'RegionSize' is the legacy region size. |
34 | // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionSize[XYZ] as a region might not | 34 | // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not |
35 | // be the legacy region size. | 35 | // be the legacy region size. |
36 | public const uint RegionSize = 256; | 36 | public const uint RegionSize = 256; |
37 | public const uint RegionHeight = 4096; | 37 | public const uint RegionHeight = 4096; |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 35278f8..1de30af 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -236,6 +236,10 @@ namespace OpenSim.Framework | |||
236 | 236 | ||
237 | public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri) | 237 | public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri) |
238 | { | 238 | { |
239 | RegionLocX = legacyRegionLocX; | ||
240 | RegionLocY = legacyRegionLocY; | ||
241 | RegionSizeX = Constants.RegionSize; | ||
242 | RegionSizeY = Constants.RegionSize; | ||
239 | m_internalEndPoint = internalEndPoint; | 243 | m_internalEndPoint = internalEndPoint; |
240 | m_externalHostName = externalUri; | 244 | m_externalHostName = externalUri; |
241 | m_serverURI = string.Empty; | 245 | m_serverURI = string.Empty; |