diff options
| author | Melanie | 2009-10-06 17:44:59 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-06 17:44:59 +0100 |
| commit | 0374f1b144f3faf35da39e3925e8abd4b2a8bd04 (patch) | |
| tree | 456d3d532c70d32564d35fc3cb9bbc81bdf08b2e /bin/OpenSim.ini.example | |
| parent | Make sure that keys exist in arrays before trying to access them. (diff) | |
| parent | Corrected words in error message. (diff) | |
| download | opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.zip opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.gz opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.bz2 opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index fa8dc9d..5cb51b2 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -312,7 +312,7 @@ | |||
| 312 | ; Uncomment below to enable llRemoteData/remote channels | 312 | ; Uncomment below to enable llRemoteData/remote channels |
| 313 | ; remoteDataPort = 20800 | 313 | ; remoteDataPort = 20800 |
| 314 | 314 | ||
| 315 | grid_server_url = "http://127.0.0.1:8001" | 315 | grid_server_url = "http://127.0.0.1:8003" |
| 316 | grid_send_key = "null" | 316 | grid_send_key = "null" |
| 317 | grid_recv_key = "null" | 317 | grid_recv_key = "null" |
| 318 | 318 | ||
| @@ -322,7 +322,7 @@ | |||
| 322 | 322 | ||
| 323 | asset_server_url = "http://127.0.0.1:8003" | 323 | asset_server_url = "http://127.0.0.1:8003" |
| 324 | 324 | ||
| 325 | inventory_server_url = "http://127.0.0.1:8004" | 325 | inventory_server_url = "http://127.0.0.1:8003" |
| 326 | 326 | ||
| 327 | ; The MessagingServer is a companion of the UserServer. It uses | 327 | ; The MessagingServer is a companion of the UserServer. It uses |
| 328 | ; user_send_key and user_recv_key, too | 328 | ; user_send_key and user_recv_key, too |