diff options
author | Melanie | 2010-08-21 00:32:26 +0100 |
---|---|---|
committer | Melanie | 2010-08-21 00:32:26 +0100 |
commit | f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4 (patch) | |
tree | 3ef10e646ddda95929142eb2c3774b42d0923b3b /bin/OpenSim.ini.example | |
parent | Forward-port a small improvement to the land out connector (diff) | |
parent | Forward-port a small improvement to the land out connector (diff) | |
download | opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.zip opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.gz opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.bz2 opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index cf9e217..674a454 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -300,7 +300,7 @@ | |||
300 | 300 | ||
301 | ; What is reported as the "X-Secondlife-Shard" | 301 | ; What is reported as the "X-Secondlife-Shard" |
302 | ; Defaults to the user server url if not set | 302 | ; Defaults to the user server url if not set |
303 | ; The old default is "OpenSim", set here fro compatibility | 303 | ; The old default is "OpenSim", set here for compatibility |
304 | shard = "OpenSim" | 304 | shard = "OpenSim" |
305 | 305 | ||
306 | ; What is reported as the "User-Agent" when using llHTTPRequest | 306 | ; What is reported as the "User-Agent" when using llHTTPRequest |
@@ -309,6 +309,18 @@ | |||
309 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 309 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
310 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 310 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
311 | 311 | ||
312 | [XMLRPC] | ||
313 | ; ## | ||
314 | ; ## Scripting XMLRPC mapper | ||
315 | ; ## | ||
316 | |||
317 | ; If enabled, this will post an event, "xmlrpc_uri(string)" to the | ||
318 | ; script concurrently with the first remote_data event. | ||
319 | ; This will contain the fully qualified URI an external site needs | ||
320 | ; to use to send XMLRPC requests to that script | ||
321 | |||
322 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | ||
323 | ;XmlRpcPort = 20800 | ||
312 | 324 | ||
313 | [ClientStack.LindenUDP] | 325 | [ClientStack.LindenUDP] |
314 | ; Set this to true to process incoming packets asynchronously. Networking is | 326 | ; Set this to true to process incoming packets asynchronously. Networking is |
@@ -1180,37 +1192,38 @@ UseSafetyCommit = true | |||
1180 | ;vivox_channel_clamping_distance = 10 | 1192 | ;vivox_channel_clamping_distance = 10 |
1181 | 1193 | ||
1182 | [FreeSwitchVoice] | 1194 | [FreeSwitchVoice] |
1183 | ; In order for this to work you need a functioning freeswitch pbx set | 1195 | ; In order for this to work you need a functioning FreeSWITCH PBX set up. |
1184 | ; up. Configuration for that will be posted in the wiki soon. | 1196 | ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module |
1185 | enabled = false | 1197 | enabled = false |
1186 | ;FreeSwitch server is going to contact us and ask us all | 1198 | ; FreeSWITCH server is going to contact us and ask us all sorts of things |
1187 | ;sorts of things. | ||
1188 | freeswitch_server_user = freeswitch | 1199 | freeswitch_server_user = freeswitch |
1189 | freeswitch_server_pass = password | 1200 | freeswitch_server_pass = password |
1190 | freeswitch_api_prefix = /api | 1201 | freeswitch_api_prefix = /api |
1191 | ; this is the IP of your sim | 1202 | ; external IP address of your OpenSim voice enabled region |
1203 | ; note: all regions running on same OpenSim.exe will be enabled | ||
1192 | freeswitch_service_server = ip.address.of.your.sim | 1204 | freeswitch_service_server = ip.address.of.your.sim |
1193 | ;freeswitch_service_port = 80 | ||
1194 | ; this should be the same port the region listens on | 1205 | ; this should be the same port the region listens on |
1195 | freeswitch_service_port = 9000 | 1206 | freeswitch_service_port = 9000 |
1196 | freeswitch_realm = ip.address.of.freeswitch.server | 1207 | freeswitch_realm = ip.address.of.freeswitch.server |
1197 | freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 | 1208 | freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 |
1209 | ; STUN = Simple Traversal of UDP through NATs | ||
1210 | ; See http://wiki.freeswitch.org/wiki/NAT_Traversal | ||
1211 | ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk | ||
1198 | freeswitch_attempt_stun = false | 1212 | freeswitch_attempt_stun = false |
1199 | freeswitch_stun_server = ip.address.of.freeswitch.server | 1213 | freeswitch_stun_server = ip.address.of.stun.server |
1200 | freeswitch_echo_server = ip.address.of.freeswitch.server | 1214 | freeswitch_echo_server = ip.address.of.freeswitch.server |
1201 | freeswitch_echo_port = 50505 | 1215 | freeswitch_echo_port = 50505 |
1202 | freeswitch_well_known_ip = ip.address.of.freeswitch.server | 1216 | freeswitch_well_known_ip = ip.address.of.freeswitch.server |
1203 | 1217 | ; | |
1204 | ;Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname | 1218 | ; Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname |
1205 | ;This is used by client for account verification. By default, it's the same as the freeswitch service server. | 1219 | ; This is used by client for account verification. By default, it's the same as the freeswitch service server. |
1206 | 1220 | ; | |
1207 | ;opensim_well_known_http_address = Address_Of_your_SIM_HTTP_Server_Hostname_Allowed | 1221 | ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed |
1208 | 1222 | ; | |
1209 | freeswitch_default_timeout = 5000 | 1223 | freeswitch_default_timeout = 5000 |
1210 | freeswitch_subscribe_retry = 120 | 1224 | freeswitch_subscribe_retry = 120 |
1211 | ; freeswitch_password_reset_url = | 1225 | ; freeswitch_password_reset_url = |
1212 | 1226 | ||
1213 | |||
1214 | [Groups] | 1227 | [Groups] |
1215 | Enabled = false | 1228 | Enabled = false |
1216 | 1229 | ||
@@ -1331,16 +1344,8 @@ Message = "The MOTD module is working!" | |||
1331 | [Modules] | 1344 | [Modules] |
1332 | Include-modules = "addon-modules/*/config/*.ini" | 1345 | Include-modules = "addon-modules/*/config/*.ini" |
1333 | 1346 | ||
1334 | [XMLRPC] | ||
1335 | ; ## | ||
1336 | ; ## Scripting XMLRPC mapper | ||
1337 | ; ## | ||
1338 | |||
1339 | ; If enabled, this will post an event, "xmlrpc_uri(string)" to the | ||
1340 | ; script concurrently with the first remote_data event. | ||
1341 | ; This will contain the fully qualified URI an external site needs | ||
1342 | ; to use to send XMLRPC requests to that script | ||
1343 | |||
1344 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | ||
1345 | ;XmlRpcPort = 20800 | ||
1346 | 1347 | ||
1348 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
1349 | ;; ENSURE [Architecture] and [Modules] Sections with their "includes" | ||
1350 | ;; are last to allow for overrides | ||
1351 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||