aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Chat
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 02:22:26 +0000
committerMelanie Thielker2009-07-10 02:22:26 +0000
commitc310fb11f492419de60b4bf8e5bb234e4589b336 (patch)
treea7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Region/OptionalModules/Avatar/Chat
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Chat')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index b17a7e1..0c696e3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
90 { 90 {
91 m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName); 91 m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName);
92 if (!String.IsNullOrEmpty(m_password)) 92 if (!String.IsNullOrEmpty(m_password))
93 scene.CommsManager.HttpServer.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false); 93 MainServer.Instance.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false);
94 m_region = new RegionState(scene, m_config); 94 m_region = new RegionState(scene, m_config);
95 lock (m_regions) m_regions.Add(m_region); 95 lock (m_regions) m_regions.Add(m_region);
96 m_region.Open(); 96 m_region.Open();
@@ -121,7 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
121 return; 121 return;
122 122
123 if (!String.IsNullOrEmpty(m_password)) 123 if (!String.IsNullOrEmpty(m_password))
124 scene.CommsManager.HttpServer.RemoveXmlRPCHandler("irc_admin"); 124 MainServer.Instance.RemoveXmlRPCHandler("irc_admin");
125 125
126 m_region.Close(); 126 m_region.Close();
127 127