aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorAi Austin2010-08-16 15:19:20 +0100
committerDiva Canto2010-08-24 17:15:20 -0700
commitb85db02f974c9f5412104b741c1ee7cccf9822b8 (patch)
treeca1c6bdfb790d30d38bc9f21328696a744623a07 /bin
parentMake some small corrections to ini.example file changes. These are not funct... (diff)
downloadopensim-SC_OLD-b85db02f974c9f5412104b741c1ee7cccf9822b8.zip
opensim-SC_OLD-b85db02f974c9f5412104b741c1ee7cccf9822b8.tar.gz
opensim-SC_OLD-b85db02f974c9f5412104b741c1ee7cccf9822b8.tar.bz2
opensim-SC_OLD-b85db02f974c9f5412104b741c1ee7cccf9822b8.tar.xz
OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section away from end and correction of typo "fro" (fixes Mantis 4833)
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example59
1 files changed, 32 insertions, 27 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cfc44af..4b066d2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -291,7 +291,7 @@
291 291
292 ; What is reported as the "X-Secondlife-Shard" 292 ; What is reported as the "X-Secondlife-Shard"
293 ; Defaults to the user server url if not set 293 ; Defaults to the user server url if not set
294 ; The old default is "OpenSim", set here fro compatibility 294 ; The old default is "OpenSim", set here for compatibility
295 shard = "OpenSim" 295 shard = "OpenSim"
296 296
297 ; What is reported as the "User-Agent" when using llHTTPRequest 297 ; What is reported as the "User-Agent" when using llHTTPRequest
@@ -300,6 +300,18 @@
300 ; " (Mozilla Compatible)" to the text where there are problems with a web server 300 ; " (Mozilla Compatible)" to the text where there are problems with a web server
301 ;user_agent = "OpenSim LSL (Mozilla Compatible)" 301 ;user_agent = "OpenSim LSL (Mozilla Compatible)"
302 302
303[XMLRPC]
304 ; ##
305 ; ## Scripting XMLRPC mapper
306 ; ##
307
308 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
309 ; script concurrently with the first remote_data event.
310 ; This will contain the fully qualified URI an external site needs
311 ; to use to send XMLRPC requests to that script
312
313 ;XmlRpcRouterModule = "XmlRpcRouterModule"
314 ;XmlRpcPort = 20800
303 315
304[ClientStack.LindenUDP] 316[ClientStack.LindenUDP]
305 ; Set this to true to process incoming packets asynchronously. Networking is 317 ; Set this to true to process incoming packets asynchronously. Networking is
@@ -1148,37 +1160,38 @@
1148 ;vivox_channel_clamping_distance = 10 1160 ;vivox_channel_clamping_distance = 10
1149 1161
1150[FreeSwitchVoice] 1162[FreeSwitchVoice]
1151 ; In order for this to work you need a functioning freeswitch pbx set 1163 ; In order for this to work you need a functioning FreeSWITCH PBX set up.
1152 ; up. Configuration for that will be posted in the wiki soon. 1164 ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
1153 enabled = false 1165 enabled = false
1154 ;FreeSwitch server is going to contact us and ask us all 1166 ; FreeSWITCH server is going to contact us and ask us all sorts of things
1155 ;sorts of things.
1156 freeswitch_server_user = freeswitch 1167 freeswitch_server_user = freeswitch
1157 freeswitch_server_pass = password 1168 freeswitch_server_pass = password
1158 freeswitch_api_prefix = /api 1169 freeswitch_api_prefix = /api
1159 ; this is the IP of your sim 1170 ; external IP address of your OpenSim voice enabled region
1171 ; note: all regions running on same OpenSim.exe will be enabled
1160 freeswitch_service_server = ip.address.of.your.sim 1172 freeswitch_service_server = ip.address.of.your.sim
1161 ;freeswitch_service_port = 80
1162 ; this should be the same port the region listens on 1173 ; this should be the same port the region listens on
1163 freeswitch_service_port = 9000 1174 freeswitch_service_port = 9000
1164 freeswitch_realm = ip.address.of.freeswitch.server 1175 freeswitch_realm = ip.address.of.freeswitch.server
1165 freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 1176 freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
1177 ; STUN = Simple Traversal of UDP through NATs
1178 ; See http://wiki.freeswitch.org/wiki/NAT_Traversal
1179 ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk
1166 freeswitch_attempt_stun = false 1180 freeswitch_attempt_stun = false
1167 freeswitch_stun_server = ip.address.of.freeswitch.server 1181 freeswitch_stun_server = ip.address.of.stun.server
1168 freeswitch_echo_server = ip.address.of.freeswitch.server 1182 freeswitch_echo_server = ip.address.of.freeswitch.server
1169 freeswitch_echo_port = 50505 1183 freeswitch_echo_port = 50505
1170 freeswitch_well_known_ip = ip.address.of.freeswitch.server 1184 freeswitch_well_known_ip = ip.address.of.freeswitch.server
1171 1185 ;
1172 ;Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname 1186 ; Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname
1173 ;This is used by client for account verification. By default, it's the same as the freeswitch service server. 1187 ; This is used by client for account verification. By default, it's the same as the freeswitch service server.
1174 1188 ;
1175 ;opensim_well_known_http_address = Address_Of_your_SIM_HTTP_Server_Hostname_Allowed 1189 ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
1176 1190 ;
1177 freeswitch_default_timeout = 5000 1191 freeswitch_default_timeout = 5000
1178 freeswitch_subscribe_retry = 120 1192 freeswitch_subscribe_retry = 120
1179 ; freeswitch_password_reset_url = 1193 ; freeswitch_password_reset_url =
1180 1194
1181
1182[Groups] 1195[Groups]
1183 Enabled = false 1196 Enabled = false
1184 1197
@@ -1287,16 +1300,8 @@
1287[Modules] 1300[Modules]
1288 Include-modules = "addon-modules/*/config/*.ini" 1301 Include-modules = "addon-modules/*/config/*.ini"
1289 1302
1290[XMLRPC]
1291 ; ##
1292 ; ## Scripting XMLRPC mapper
1293 ; ##
1294
1295 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
1296 ; script concurrently with the first remote_data event.
1297 ; This will contain the fully qualified URI an external site needs
1298 ; to use to send XMLRPC requests to that script
1299
1300 ;XmlRpcRouterModule = "XmlRpcRouterModule"
1301 ;XmlRpcPort = 20800
1302 1303
1304;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1305;; ENSURE [Architecture] and [Modules] Sections with their "includes"
1306;; are last to allow for overrides
1307;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;