aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Concierge
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/Concierge
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC-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/Concierge')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 6ef30c4..96b6888 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
144 { 144 {
145 if (!m_enabled) return; 145 if (!m_enabled) return;
146 146
147 scene.CommsManager.HttpServer.AddXmlRPCHandler("concierge_update_welcome", XmlRpcUpdateWelcomeMethod, false); 147 MainServer.Instance.AddXmlRPCHandler("concierge_update_welcome", XmlRpcUpdateWelcomeMethod, false);
148 148
149 lock (m_syncy) 149 lock (m_syncy)
150 { 150 {
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
176 { 176 {
177 if (!m_enabled) return; 177 if (!m_enabled) return;
178 178
179 scene.CommsManager.HttpServer.RemoveXmlRPCHandler("concierge_update_welcome"); 179 MainServer.Instance.RemoveXmlRPCHandler("concierge_update_welcome");
180 180
181 lock (m_syncy) 181 lock (m_syncy)
182 { 182 {