diff options
| author | Melanie | 2010-10-30 02:26:18 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-30 02:26:18 +0100 |
| commit | ba6f651b063912629214bbf8f904593dbf153ff9 (patch) | |
| tree | 409df83c4932b5ee8249065543917a75240dc996 /bin | |
| parent | This commit fixes all the appearance related null refs. Still can't log in, (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-ba6f651b063912629214bbf8f904593dbf153ff9.zip opensim-SC_OLD-ba6f651b063912629214bbf8f904593dbf153ff9.tar.gz opensim-SC_OLD-ba6f651b063912629214bbf8f904593dbf153ff9.tar.bz2 opensim-SC_OLD-ba6f651b063912629214bbf8f904593dbf153ff9.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 4 | ||||
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index b81642a..e1627c0 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -64,7 +64,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 64 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 64 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
| 65 | ; Realm = "regions" | 65 | ; Realm = "regions" |
| 66 | ; AllowDuplicateNames = "True" | 66 | ; AllowDuplicateNames = "True" |
| 67 | ; Check4096 = "False" | 67 | |
| 68 | ;; Perform distance check for the creation of a linked region | ||
| 69 | ; Check4096 = "True" | ||
| 68 | 70 | ||
| 69 | ;; Next, we can specify properties of regions, including default and fallback regions | 71 | ;; Next, we can specify properties of regions, including default and fallback regions |
| 70 | ;; The syntax is: Region_<RegionName> = "<flags>" | 72 | ;; The syntax is: Region_<RegionName> = "<flags>" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 2f021d5..1fcf043 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | ;;--- For MySql region storage (alternative) | 53 | ;;--- For MySql region storage (alternative) |
| 54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | 54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" |
| 55 | 55 | ||
| 56 | ; If HG, do you want this check on the distance to be performed? | 56 | ;; With hypergrid, perform distance check for the creation of a linked region |
| 57 | ; Check4096 = "False" | 57 | ; Check4096 = true |
| 58 | 58 | ||
| 59 | ;; Next, we can specify properties of regions, including default and fallback regions | 59 | ;; Next, we can specify properties of regions, including default and fallback regions |
| 60 | ;; The syntax is: Region_<RegioName> = "<flags>" | 60 | ;; The syntax is: Region_<RegioName> = "<flags>" |