Thanks to mpallari for Mantis #3310: Make EventQueueGetModule more inheritable

0.6.5-rc1
Dahlia Trimble 2009-03-19 07:06:30 +00:00
parent 247a25a7fe
commit d23f0ec143
1 changed files with 8 additions and 8 deletions

View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
public class EventQueueGetModule : IEventQueue, IRegionModule public class EventQueueGetModule : IEventQueue, IRegionModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene = null; protected Scene m_scene = null;
private IConfigSource m_gConfig; private IConfigSource m_gConfig;
bool enabledYN = false; bool enabledYN = false;
@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>(); private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
#region IRegionModule methods #region IRegionModule methods
public void Initialise(Scene scene, IConfigSource config) public virtual void Initialise(Scene scene, IConfigSource config)
{ {
m_gConfig = config; m_gConfig = config;
@ -110,11 +110,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
{ {
} }
public void Close() public virtual void Close()
{ {
} }
public string Name public virtual string Name
{ {
get { return "EventQueueGetModule"; } get { return "EventQueueGetModule"; }
} }
@ -553,19 +553,19 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
Enqueue(item, avatarID); Enqueue(item, avatarID);
} }
public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID)
{ {
OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); OSD item = EventQueueHelper.EnableSimulator(handle, endPoint);
Enqueue(item, avatarID); Enqueue(item, avatarID);
} }
public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath)
{ {
OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath);
Enqueue(item, avatarID); Enqueue(item, avatarID);
} }
public void TeleportFinishEvent(ulong regionHandle, byte simAccess, public virtual void TeleportFinishEvent(ulong regionHandle, byte simAccess,
IPEndPoint regionExternalEndPoint, IPEndPoint regionExternalEndPoint,
uint locationID, uint flags, string capsURL, uint locationID, uint flags, string capsURL,
UUID avatarID) UUID avatarID)
@ -575,7 +575,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
Enqueue(item, avatarID); Enqueue(item, avatarID);
} }
public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, public virtual void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
IPEndPoint newRegionExternalEndPoint, IPEndPoint newRegionExternalEndPoint,
string capsURL, UUID avatarID, UUID sessionID) string capsURL, UUID avatarID, UUID sessionID)
{ {