diff options
| author | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
| commit | 4851706d35ca0e24e0f69348d957145631a8d94c (patch) | |
| tree | ad984517af1449c717a387d5a07eca0ec2285f93 /bin | |
| parent | Catch newid == null which is what happens if the asset service is offline (se... (diff) | |
| parent | Avoid a spurious error message when taking a friend's no copy item (diff) | |
| download | opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.zip opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.gz opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.bz2 opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.32BitLaunch.exe | bin | 5632 -> 5632 bytes | |||
| -rw-r--r-- | bin/Robust.HG.ini.example | 4 | ||||
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe index 14a6db3..747d02f 100644 --- a/bin/Robust.32BitLaunch.exe +++ b/bin/Robust.32BitLaunch.exe | |||
| Binary files differ | |||
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 39228eb..6b0029f 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 198 | ; CHANGE THIS | 198 | ; CHANGE THIS |
| 199 | ExternalName = "http://127.0.0.1:8002" | 199 | ExternalName = "http://127.0.0.1:8002" |
| 200 | 200 | ||
| 201 | ; Does this grid allow incoming links to any region in it? | ||
| 202 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | ||
| 203 | AllowTeleportsToAnyRegion = true | ||
| 204 | |||
| 201 | [UserAgentService] | 205 | [UserAgentService] |
| 202 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" | 206 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 203 | ;; for the service | 207 | ;; for the service |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index bfa6725..de8677f 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
| @@ -68,3 +68,8 @@ | |||
| 68 | 68 | ||
| 69 | [GatekeeperService] | 69 | [GatekeeperService] |
| 70 | ExternalName = "http://127.0.0.1:9000" | 70 | ExternalName = "http://127.0.0.1:9000" |
| 71 | |||
| 72 | ; Does this grid allow incoming links to any region in it? | ||
| 73 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | ||
| 74 | AllowTeleportsToAnyRegion = true | ||
| 75 | |||