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/Robust.HG.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/Robust.HG.ini.example')
-rw-r--r-- | bin/Robust.HG.ini.example | 4 |
1 files changed, 3 insertions, 1 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>" |