aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorRobert Adams2015-03-28 07:50:04 -0700
committerRobert Adams2015-03-28 07:50:04 -0700
commit08c72a8dc1e54114559521a6c2952905ecf6f105 (patch)
treecdc1f379109500504516755fcd3d4e9c6c4e3218 /OpenSim/Region/ClientStack
parentvarregion: refactor use of 'double heightmap[,]' into references to new class... (diff)
downloadopensim-SC_OLD-08c72a8dc1e54114559521a6c2952905ecf6f105.zip
opensim-SC_OLD-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.gz
opensim-SC_OLD-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.bz2
opensim-SC_OLD-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.xz
varregion: remove use of Constants.RegionSize is various places.
More use of the Util routines for conversion of region handles into addresses.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index ca6c3ca..51535a6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.ClientStack.Linden
59 public class EventQueueGetModule : IEventQueue, INonSharedRegionModule 59 public class EventQueueGetModule : IEventQueue, INonSharedRegionModule
60 { 60 {
61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
62 private static string LogHeader = "[EVENT QUEUE GET MODULE]";
62 63
63 /// <value> 64 /// <value>
64 /// Debug level. 65 /// Debug level.
@@ -479,7 +480,7 @@ namespace OpenSim.Region.ClientStack.Linden
479 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) 480 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
480 { 481 {
481 m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>", 482 m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>",
482 "[EVENT QUEUE GET MODULE]", handle, avatarID, regionSizeX, regionSizeY); 483 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
483 484
484 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY); 485 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
485 Enqueue(item, avatarID); 486 Enqueue(item, avatarID);
@@ -489,7 +490,7 @@ namespace OpenSim.Region.ClientStack.Linden
489 ulong regionHandle, int regionSizeX, int regionSizeY) 490 ulong regionHandle, int regionSizeX, int regionSizeY)
490 { 491 {
491 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>", 492 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>",
492 "[EVENT QUEUE GET MODULE]", regionHandle, avatarID, regionSizeX, regionSizeY); 493 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
493 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY); 494 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
494 Enqueue(item, avatarID); 495 Enqueue(item, avatarID);
495 } 496 }
@@ -500,7 +501,7 @@ namespace OpenSim.Region.ClientStack.Linden
500 UUID avatarID, int regionSizeX, int regionSizeY) 501 UUID avatarID, int regionSizeX, int regionSizeY)
501 { 502 {
502 m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize={3},{4}>", 503 m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize={3},{4}>",
503 "[EVENT QUEUE GET MODULE]", regionHandle, avatarID, regionSizeX, regionSizeY); 504 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY);
504 505
505 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, 506 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
506 locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY); 507 locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
@@ -512,7 +513,7 @@ namespace OpenSim.Region.ClientStack.Linden
512 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY) 513 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
513 { 514 {
514 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>", 515 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
515 "[EVENT QUEUE GET MODULE]", handle, avatarID, regionSizeX, regionSizeY); 516 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
516 517
517 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, 518 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
518 capsURL, avatarID, sessionID, regionSizeX, regionSizeY); 519 capsURL, avatarID, sessionID, regionSizeX, regionSizeY);