culling AsteriskVoiceModule and SIPVoiceModule, now that we have

working FreeSwitchVoiceModule and soon will have a fully working
VivoxVoiceModule.

1 files changed, 23 insertions, 52 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8612875..dcae9ff 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -694,35 +694,6 @@
     ;enabled = true
     ;channel = 345
 
-
-[Voice]
-    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
-    enabled = false
-    ; This is not supported by the SLViewer right now and
-    ; hardcoded within the SL Viewer. Maybe it will be
-    ; changed in future. :-)
-    account_management_server = https://www.bhr.vivox.com/api2
-    ; Global SIP Server for conference calls
-    sip_domain = testserver.com
-
-
-[AsteriskVoice]
-    ; PLEASE NOTE that we don't have voice support in OpenSim quite yet - these configuration options are stubs
-    enabled = false
-    ; SIP account server domain
-    sip_domain = testserver.com
-    ; SIP conf server domain
-    conf_domain = testserver.com
-    ; URL of the asterisk opensim frontend
-    asterisk_frontend = http://testserver.com:49153/
-    ; password for the asterisk frontend XmlRpc calls
-    asterisk_password = bah-humbug
-    ; timeout for XmlRpc calls to asterisk front end (in ms)
-    asterisk_timeout = 3000
-    ; salt for asterisk nonces
-    asterisk_salt = paluempalum
-
-
 ; Uncomment the following to control the progression of daytime
 ; in the Sim.  The defaults are what is shown below
 ;[Sun]
@@ -1217,29 +1188,29 @@
         safemode = false
 
 [FreeSwitchVoice]
-; In order for this to work you need a functioning freeswitch pbx set
-; up.  Configuration for that will be posted in the wiki soon.
-enabled = true      
-;FreeSwitch server is going to contact us and ask us all     
-;sorts of things.     
-freeswitch_server_user = freeswitch     
-freeswitch_server_pass = password     
-freeswitch_api_prefix = /api     
-; this is the IP of your sim     
-freeswitch_service_server = ip.address.of.your.sim
-;freeswitch_service_port = 80     
-; this should be the same port the region listens on
-freeswitch_service_port = 9000
-freeswitch_realm = ip.address.of.freeswitch.server
-freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
-freeswitch_attempt_stun = false
-freeswitch_stun_server = ip.address.of.freeswitch.server
-freeswitch_echo_server = ip.address.of.freeswitch.server
-freeswitch_echo_port = 50505
-freeswitch_well_known_ip = ip.address.of.freeswitch.server
-freeswitch_default_timeout = 5000
-freeswitch_subscribe_retry = 120
-; freeswitch_password_reset_url =  
+    ; In order for this to work you need a functioning freeswitch pbx set
+    ; up.  Configuration for that will be posted in the wiki soon.
+    enabled = true      
+    ;FreeSwitch server is going to contact us and ask us all     
+    ;sorts of things.     
+    freeswitch_server_user = freeswitch     
+    freeswitch_server_pass = password     
+    freeswitch_api_prefix = /api     
+    ; this is the IP of your sim     
+    freeswitch_service_server = ip.address.of.your.sim
+    ;freeswitch_service_port = 80     
+    ; this should be the same port the region listens on
+    freeswitch_service_port = 9000
+    freeswitch_realm = ip.address.of.freeswitch.server
+    freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
+    freeswitch_attempt_stun = false
+    freeswitch_stun_server = ip.address.of.freeswitch.server
+    freeswitch_echo_server = ip.address.of.freeswitch.server
+    freeswitch_echo_port = 50505
+    freeswitch_well_known_ip = ip.address.of.freeswitch.server
+    freeswitch_default_timeout = 5000
+    freeswitch_subscribe_retry = 120
+    ; freeswitch_password_reset_url =  
 
 
 [Groups]