aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs12
3 files changed, 10 insertions, 10 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
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 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 469ac2f..5c562ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -170,31 +170,31 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
170 // - signout: viv_signout.php 170 // - signout: viv_signout.php
171 if (UseProxy) 171 if (UseProxy)
172 { 172 {
173 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/", m_freeSwitchAPIPrefix), 173 MainServer.Instance.AddHTTPHandler(String.Format("{0}/", m_freeSwitchAPIPrefix),
174 ForwardProxyRequest); 174 ForwardProxyRequest);
175 } 175 }
176 else 176 else
177 { 177 {
178 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), 178 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
179 FreeSwitchSLVoiceGetPreloginHTTPHandler); 179 FreeSwitchSLVoiceGetPreloginHTTPHandler);
180 180
181 // RestStreamHandler h = new 181 // RestStreamHandler h = new
182 // RestStreamHandler("GET", 182 // RestStreamHandler("GET",
183 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler); 183 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
184 // scene.CommsManager.HttpServer.AddStreamHandler(h); 184 // MainServer.Instance.AddStreamHandler(h);
185 185
186 186
187 187
188 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix), 188 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix),
189 FreeSwitchSLVoiceSigninHTTPHandler); 189 FreeSwitchSLVoiceSigninHTTPHandler);
190 190
191 // set up http request handlers to provide 191 // set up http request handlers to provide
192 // on-demand FreeSwitch configuration to 192 // on-demand FreeSwitch configuration to
193 // FreeSwitch's mod_curl_xml 193 // FreeSwitch's mod_curl_xml
194 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix), 194 MainServer.Instance.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix),
195 FreeSwitchConfigHTTPHandler); 195 FreeSwitchConfigHTTPHandler);
196 196
197 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix), 197 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
198 FreeSwitchSLVoiceBuddyHTTPHandler); 198 FreeSwitchSLVoiceBuddyHTTPHandler);
199 } 199 }
200 200