diff options
| author | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
| commit | e371d3208cdda87f8ea86adb591ed6225f0aa442 (patch) | |
| tree | f481acfbafcb7134c00ff519c0c12b41e7815d02 /bin/config-include/StandaloneCommon.ini.example | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
| download | opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2 opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to 'bin/config-include/StandaloneCommon.ini.example')
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 |
1 files changed, 2 insertions, 2 deletions
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>" |