aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDahlia Trimble2009-03-19 07:06:30 +0000
committerDahlia Trimble2009-03-19 07:06:30 +0000
commitd23f0ec14321fded5ba9638131017b0c29ec5971 (patch)
tree1ce7631e10a6c767edb417084de87b499dae088f /OpenSim/Region
parentMaking a couple of methods public. (diff)
downloadopensim-SC_OLD-d23f0ec14321fded5ba9638131017b0c29ec5971.zip
opensim-SC_OLD-d23f0ec14321fded5ba9638131017b0c29ec5971.tar.gz
opensim-SC_OLD-d23f0ec14321fded5ba9638131017b0c29ec5971.tar.bz2
opensim-SC_OLD-d23f0ec14321fded5ba9638131017b0c29ec5971.tar.xz
Thanks to mpallari for Mantis #3310: Make EventQueueGetModule more inheritable
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index c0395b9..32a4e6f 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
54 public class EventQueueGetModule : IEventQueue, IRegionModule 54 public class EventQueueGetModule : IEventQueue, IRegionModule
55 { 55 {
56 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 56 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
57 private Scene m_scene = null; 57 protected Scene m_scene = null;
58 private IConfigSource m_gConfig; 58 private IConfigSource m_gConfig;
59 bool enabledYN = false; 59 bool enabledYN = false;
60 60
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
65 private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>(); 65 private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
66 66
67 #region IRegionModule methods 67 #region IRegionModule methods
68 public void Initialise(Scene scene, IConfigSource config) 68 public virtual void Initialise(Scene scene, IConfigSource config)
69 { 69 {
70 m_gConfig = config; 70 m_gConfig = config;
71 71
@@ -110,11 +110,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
110 { 110 {
111 } 111 }
112 112
113 public void Close() 113 public virtual void Close()
114 { 114 {
115 } 115 }
116 116
117 public string Name 117 public virtual string Name
118 { 118 {
119 get { return "EventQueueGetModule"; } 119 get { return "EventQueueGetModule"; }
120 } 120 }
@@ -553,19 +553,19 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
553 Enqueue(item, avatarID); 553 Enqueue(item, avatarID);
554 } 554 }
555 555
556 public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) 556 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID)
557 { 557 {
558 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); 558 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint);
559 Enqueue(item, avatarID); 559 Enqueue(item, avatarID);
560 } 560 }
561 561
562 public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) 562 public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath)
563 { 563 {
564 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); 564 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath);
565 Enqueue(item, avatarID); 565 Enqueue(item, avatarID);
566 } 566 }
567 567
568 public void TeleportFinishEvent(ulong regionHandle, byte simAccess, 568 public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess,
569 IPEndPoint regionExternalEndPoint, 569 IPEndPoint regionExternalEndPoint,
570 uint locationID, uint flags, string capsURL, 570 uint locationID, uint flags, string capsURL,
571 UUID avatarID) 571 UUID avatarID)
@@ -575,7 +575,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
575 Enqueue(item, avatarID); 575 Enqueue(item, avatarID);
576 } 576 }
577 577
578 public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, 578 public virtual void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
579 IPEndPoint newRegionExternalEndPoint, 579 IPEndPoint newRegionExternalEndPoint,
580 string capsURL, UUID avatarID, UUID sessionID) 580 string capsURL, UUID avatarID, UUID sessionID)
581 { 581 {