aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice
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/Voice
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/Voice')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs12
1 files changed, 6 insertions, 6 deletions
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