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/config-include/StandaloneCommon.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-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 5 |
1 files changed, 5 insertions, 0 deletions
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 | |||