diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /bin/Robust.HG.ini.example | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 4 |
1 files changed, 4 insertions, 0 deletions
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 |