diff options
| author | Melanie | 2013-08-01 01:23:24 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-01 01:23:24 +0100 |
| commit | 21f5e670303ee978c747567e674e5ebe256ad2c7 (patch) | |
| tree | 19c3740cbb8bf78d038e64b2fb66ea837cc8f724 /bin/config-include/GridCommon.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Include missing reference that probably stops windows build from commit 12995... (diff) | |
| download | opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.zip opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.gz opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.bz2 opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index d12ea5b..920a691 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -205,3 +205,12 @@ | |||
| 205 | ; DisallowResidents -- only Admins and Managers allowed | 205 | ; DisallowResidents -- only Admins and Managers allowed |
| 206 | ; Example: | 206 | ; Example: |
| 207 | ; Region_Test_1 = "DisallowForeigners" | 207 | ; Region_Test_1 = "DisallowForeigners" |
| 208 | |||
| 209 | |||
| 210 | ;; Uncomment if you are using SimianGrid for grid services | ||
| 211 | [SimianGrid] | ||
| 212 | ;; SimianGrid services URL | ||
| 213 | ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/" | ||
| 214 | |||
| 215 | ;; Capability assigned by the grid administrator for the simulator | ||
| 216 | ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000" \ No newline at end of file | ||