diff options
author | Melanie Thielker | 2009-02-19 13:02:11 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-19 13:02:11 +0000 |
commit | c98a9d1ccd3b7f4862e2dfcf85017067607c83f5 (patch) | |
tree | 5be31e932b79512f4aba65837c3de90db4f5b2f7 | |
parent | * Hm. Something odd here, the Prebuild.exe wasn't supposed to change from las... (diff) | |
download | opensim-SC_OLD-c98a9d1ccd3b7f4862e2dfcf85017067607c83f5.zip opensim-SC_OLD-c98a9d1ccd3b7f4862e2dfcf85017067607c83f5.tar.gz opensim-SC_OLD-c98a9d1ccd3b7f4862e2dfcf85017067607c83f5.tar.bz2 opensim-SC_OLD-c98a9d1ccd3b7f4862e2dfcf85017067607c83f5.tar.xz |
Make the implementation of the message transfer module protected virtual
throughout
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 38d2d21..94a856b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -44,11 +44,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // private bool m_Enabled = false; | 46 | // private bool m_Enabled = false; |
47 | private bool m_Gridmode = false; | 47 | protected bool m_Gridmode = false; |
48 | private List<Scene> m_Scenes = new List<Scene>(); | 48 | protected List<Scene> m_Scenes = new List<Scene>(); |
49 | private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>(); | 49 | protected Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>(); |
50 | 50 | ||
51 | public void Initialise(Scene scene, IConfigSource config) | 51 | public virtual void Initialise(Scene scene, IConfigSource config) |
52 | { | 52 | { |
53 | IConfig cnf = config.Configs["Messaging"]; | 53 | IConfig cnf = config.Configs["Messaging"]; |
54 | if (cnf != null && cnf.GetString( | 54 | if (cnf != null && cnf.GetString( |
@@ -75,25 +75,25 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | public void PostInitialise() | 78 | public virtual void PostInitialise() |
79 | { | 79 | { |
80 | } | 80 | } |
81 | 81 | ||
82 | public void Close() | 82 | public virtual void Close() |
83 | { | 83 | { |
84 | } | 84 | } |
85 | 85 | ||
86 | public string Name | 86 | public virtual string Name |
87 | { | 87 | { |
88 | get { return "MessageTransferModule"; } | 88 | get { return "MessageTransferModule"; } |
89 | } | 89 | } |
90 | 90 | ||
91 | public bool IsSharedModule | 91 | public virtual bool IsSharedModule |
92 | { | 92 | { |
93 | get { return true; } | 93 | get { return true; } |
94 | } | 94 | } |
95 | 95 | ||
96 | public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result) | 96 | public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result) |
97 | { | 97 | { |
98 | UUID toAgentID = new UUID(im.toAgentID); | 98 | UUID toAgentID = new UUID(im.toAgentID); |
99 | 99 | ||
@@ -402,7 +402,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
402 | /// </summary> | 402 | /// </summary> |
403 | public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, ulong prevRegionHandle); | 403 | public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, ulong prevRegionHandle); |
404 | 404 | ||
405 | private void GridInstantMessageCompleted(IAsyncResult iar) | 405 | protected virtual void GridInstantMessageCompleted(IAsyncResult iar) |
406 | { | 406 | { |
407 | GridInstantMessageDelegate icon = | 407 | GridInstantMessageDelegate icon = |
408 | (GridInstantMessageDelegate)iar.AsyncState; | 408 | (GridInstantMessageDelegate)iar.AsyncState; |
@@ -551,7 +551,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
551 | /// <param name="reginfo">RegionInfo we pull the data out of to send the request to</param> | 551 | /// <param name="reginfo">RegionInfo we pull the data out of to send the request to</param> |
552 | /// <param name="xmlrpcdata">The Instant Message data Hashtable</param> | 552 | /// <param name="xmlrpcdata">The Instant Message data Hashtable</param> |
553 | /// <returns>Bool if the message was successfully delivered at the other side.</returns> | 553 | /// <returns>Bool if the message was successfully delivered at the other side.</returns> |
554 | private bool doIMSending(RegionInfo reginfo, Hashtable xmlrpcdata) | 554 | protected virtual bool doIMSending(RegionInfo reginfo, Hashtable xmlrpcdata) |
555 | { | 555 | { |
556 | 556 | ||
557 | ArrayList SendParams = new ArrayList(); | 557 | ArrayList SendParams = new ArrayList(); |
@@ -595,7 +595,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
595 | /// </summary> | 595 | /// </summary> |
596 | /// <param name="regionID">UUID of region to get the region handle for</param> | 596 | /// <param name="regionID">UUID of region to get the region handle for</param> |
597 | /// <returns></returns> | 597 | /// <returns></returns> |
598 | // private ulong getLocalRegionHandleFromUUID(UUID regionID) | 598 | // private virtual ulong getLocalRegionHandleFromUUID(UUID regionID) |
599 | // { | 599 | // { |
600 | // ulong returnhandle = 0; | 600 | // ulong returnhandle = 0; |
601 | // | 601 | // |
@@ -618,7 +618,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
618 | /// </summary> | 618 | /// </summary> |
619 | /// <param name="msg">The GridInstantMessage object</param> | 619 | /// <param name="msg">The GridInstantMessage object</param> |
620 | /// <returns>Hashtable containing the XMLRPC request</returns> | 620 | /// <returns>Hashtable containing the XMLRPC request</returns> |
621 | private Hashtable ConvertGridInstantMessageToXMLRPC(GridInstantMessage msg) | 621 | protected virtual Hashtable ConvertGridInstantMessageToXMLRPC(GridInstantMessage msg) |
622 | { | 622 | { |
623 | Hashtable gim = new Hashtable(); | 623 | Hashtable gim = new Hashtable(); |
624 | gim["from_agent_id"] = msg.fromAgentID.ToString(); | 624 | gim["from_agent_id"] = msg.fromAgentID.ToString(); |