diff options
| author | Melanie | 2010-07-14 19:53:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-14 19:53:15 +0100 |
| commit | 0b74662ce2e0d0afebf977b71c34b5246b81b8f9 (patch) | |
| tree | 4fd2b4437e7a0621f3ddad4986a31d9dc328b4ee /bin | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC_OLD-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.zip opensim-SC_OLD-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.gz opensim-SC_OLD-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.bz2 opensim-SC_OLD-0b74662ce2e0d0afebf977b71c34b5246b81b8f9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index a71fe72..559a734 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -288,9 +288,6 @@ | |||
| 288 | ; if not defined - default machine name is being used | 288 | ; if not defined - default machine name is being used |
| 289 | ; (on Windows this mean NETBIOS name - useably only inside local network) | 289 | ; (on Windows this mean NETBIOS name - useably only inside local network) |
| 290 | ; ExternalHostNameForLSL=127.0.0.1 | 290 | ; ExternalHostNameForLSL=127.0.0.1 |
| 291 | ; Uncomment below to enable llRemoteData/remote channels | ||
| 292 | ; remoteDataPort = 20800 | ||
| 293 | |||
| 294 | 291 | ||
| 295 | ; What is reported as the "X-Secondlife-Shard" | 292 | ; What is reported as the "X-Secondlife-Shard" |
| 296 | ; Defaults to the user server url if not set | 293 | ; Defaults to the user server url if not set |
| @@ -1319,12 +1316,3 @@ UseSafetyCommit = true | |||
| 1319 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | 1316 | ;XmlRpcRouterModule = "XmlRpcRouterModule" |
| 1320 | ;XmlRpcPort = 20800 | 1317 | ;XmlRpcPort = 20800 |
| 1321 | 1318 | ||
| 1322 | [Friends] | ||
| 1323 | ; The port the friendslist interregion comms will listen on | ||
| 1324 | ; Defaults to the simulator's TCP port | ||
| 1325 | ;Port = 0 | ||
| 1326 | |||
| 1327 | ; Uncomment one of the lines below. Use FriendsService for local | ||
| 1328 | ; operation, Connectors for remote operation | ||
| 1329 | ;Connector = "OpenSim.Services.FriendsService.dll" | ||
| 1330 | Connector = "OpenSim.Services.Connectors.dll" | ||