diff options
| author | Melanie | 2009-10-01 14:08:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-01 14:08:15 +0100 |
| commit | 41ff39414bc70ef645e2180693792c83d61a7539 (patch) | |
| tree | dc711428d4c8fed07791263ff4dfea142d54e4e7 /bin/OpenSim.ini.example | |
| parent | Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff) | |
| parent | - adding new LandDataSerializer testcase to "test-xml" target as well (diff) | |
| download | opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.zip opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2 opensim-SC-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 97e6354..2a8a7bb 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -326,7 +326,7 @@ | |||
| 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 |
| 329 | messaging_server_url = "http://127.0.0.1:8006" | 329 | ;messaging_server_url = "http://127.0.0.1:8006" |
| 330 | 330 | ||
| 331 | ; What is reported as the "X-Secondlife-Shard" | 331 | ; What is reported as the "X-Secondlife-Shard" |
| 332 | ; Defaults to the user server url if not set | 332 | ; Defaults to the user server url if not set |