diff options
author | Melanie | 2009-10-02 08:23:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 08:23:38 +0100 |
commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
tree | a2d60604317739fa530502c40ffc71bab2a5c494 /bin/OpenSim.ini.example | |
parent | Restore the missing image handling to the image manager. The missing (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz |
Merge branch 'master' into diva-textures
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1f42ef2..50198b3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -305,6 +305,10 @@ | |||
305 | http_listener_sslport = 9001 ; Use this port for SSL connections | 305 | http_listener_sslport = 9001 ; Use this port for SSL connections |
306 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer | 306 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer |
307 | 307 | ||
308 | ; Hostname to use in llRequestURL/llRequestSecureURL | ||
309 | ; if not defined - default machine name is being used | ||
310 | ; (on Windows this mean NETBIOS name - useably only inside local network) | ||
311 | ; ExternalHostNameForLSL=127.0.0.1 | ||
308 | ; Uncomment below to enable llRemoteData/remote channels | 312 | ; Uncomment below to enable llRemoteData/remote channels |
309 | ; remoteDataPort = 20800 | 313 | ; remoteDataPort = 20800 |
310 | 314 | ||
@@ -322,7 +326,7 @@ | |||
322 | 326 | ||
323 | ; The MessagingServer is a companion of the UserServer. It uses | 327 | ; The MessagingServer is a companion of the UserServer. It uses |
324 | ; user_send_key and user_recv_key, too | 328 | ; user_send_key and user_recv_key, too |
325 | messaging_server_url = "http://127.0.0.1:8006" | 329 | ;messaging_server_url = "http://127.0.0.1:8006" |
326 | 330 | ||
327 | ; What is reported as the "X-Secondlife-Shard" | 331 | ; What is reported as the "X-Secondlife-Shard" |
328 | ; Defaults to the user server url if not set | 332 | ; Defaults to the user server url if not set |
@@ -1307,7 +1311,7 @@ | |||
1307 | ;NoticesEnabled = true | 1311 | ;NoticesEnabled = true |
1308 | 1312 | ||
1309 | ; This makes the Groups modules very chatty on the console. | 1313 | ; This makes the Groups modules very chatty on the console. |
1310 | ;DebugEnabled = true | 1314 | DebugEnabled = false |
1311 | 1315 | ||
1312 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1316 | ; Specify which messaging module to use for groups messaging and if it's enabled |
1313 | ;MessagingModule = GroupsMessagingModule | 1317 | ;MessagingModule = GroupsMessagingModule |