diff options
| author | Melanie | 2012-03-18 20:44:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-18 20:44:56 +0000 |
| commit | c7e302864a2eef7f9587ed22286c96a6074ac5b3 (patch) | |
| tree | 8f0df2f66811309fd790966770434fa3ff68bfdf /bin/config-include/GridCommon.ini.example | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Amend to previous commit: normalize strings ToLower. (diff) | |
| download | opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.zip opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.gz opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.bz2 opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 712481d..fa6f525 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -146,3 +146,13 @@ | |||
| 146 | 146 | ||
| 147 | [MapImageService] | 147 | [MapImageService] |
| 148 | MapImageServerURI = "http://mygridserver.com:8003" | 148 | MapImageServerURI = "http://mygridserver.com:8003" |
| 149 | |||
| 150 | [AuthorizationService] | ||
| 151 | ; If you have regions with access restrictions | ||
| 152 | ; specify them here using the convention | ||
| 153 | ; Region_<Region_Name> = <flags> | ||
| 154 | ; Valid flags are: | ||
| 155 | ; DisallowForeigners -- HG visitors not allowed | ||
| 156 | ; DisallowResidents -- only Admins and Managers allowed | ||
| 157 | ; Example: | ||
| 158 | ; Region_Test_1 = "DisallowForeigners" | ||