aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-12-28 01:56:30 +0000
committerMelanie2009-12-28 01:56:30 +0000
commit3a953dfc986c70287feb7e08b3ef7bbfc9e02f9e (patch)
tree91e46f05ca61ddbbc6d62ffd84a55cb804937424 /OpenSim/Region
parentChange FriendsModule, InstantMessageModule, MessageTransferModule, MuteListMo... (diff)
downloadopensim-SC_OLD-3a953dfc986c70287feb7e08b3ef7bbfc9e02f9e.zip
opensim-SC_OLD-3a953dfc986c70287feb7e08b3ef7bbfc9e02f9e.tar.gz
opensim-SC_OLD-3a953dfc986c70287feb7e08b3ef7bbfc9e02f9e.tar.bz2
opensim-SC_OLD-3a953dfc986c70287feb7e08b3ef7bbfc9e02f9e.tar.xz
This is somewhat major-like..... Change the intialization order of
Application plugins so that MainServer.Instance gets assigned before RegionModulesController loads the new style shared modules. This is needed because otherwise no new style shared module could register a HTTP method.... if it breaks, you get to keep both pieces
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs2
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index b5019f1..2d4b421 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -61,9 +61,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
61 return; 61 return;
62 } 62 }
63 63
64 MainServer.Instance.AddXmlRPCHandler(
65 "grid_instant_message", processXMLRPCGridInstantMessage);
66
67 m_Enabled = true; 64 m_Enabled = true;
68 } 65 }
69 66
@@ -82,6 +79,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
82 79
83 public virtual void PostInitialise() 80 public virtual void PostInitialise()
84 { 81 {
82 if (!m_Enabled)
83 return;
84
85 MainServer.Instance.AddXmlRPCHandler(
86 "grid_instant_message", processXMLRPCGridInstantMessage);
85 } 87 }
86 88
87 public virtual void RegionLoaded(Scene scene) 89 public virtual void RegionLoaded(Scene scene)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 1ff5865..24cbaeb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40namespace OpenSim.Region.CoreModules.Avatar.MuteList 40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
41{ 41{
42 public class MuteListModule : ISharedRegionModule 42 public class MuteListModule : ISharedRegionModule
43 { 43 {