diff options
author | CasperW | 2010-01-20 22:19:14 +0100 |
---|---|---|
committer | CasperW | 2010-01-20 22:19:14 +0100 |
commit | a964431c21a258fb016b701facf78ce7289fa9e7 (patch) | |
tree | a03f7b28a88b86ca12d8e8f094a6b676b7229a5d /bin | |
parent | Fixed an issue with PayPrice sometimes being shared between multiple objects (diff) | |
parent | Adds example to OpenSim.ini.example for Admin Default Parcel settings (diff) | |
download | opensim-SC-a964431c21a258fb016b701facf78ce7289fa9e7.zip opensim-SC-a964431c21a258fb016b701facf78ce7289fa9e7.tar.gz opensim-SC-a964431c21a258fb016b701facf78ce7289fa9e7.tar.bz2 opensim-SC-a964431c21a258fb016b701facf78ce7289fa9e7.tar.xz |
Merge branch 'master' into casper
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index c96e938..23004a4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -1351,6 +1351,9 @@ | |||
1351 | ; For example- http://127.0.0.1:9000/SStats/ | 1351 | ; For example- http://127.0.0.1:9000/SStats/ |
1352 | ; enabled=false | 1352 | ; enabled=false |
1353 | 1353 | ||
1354 | [LandManagement] | ||
1355 | ; DefaultAdministratorGroupUUID = ""; | ||
1356 | ; DefaultAdministratorParcelName = ""; | ||
1354 | 1357 | ||
1355 | ;; | 1358 | ;; |
1356 | ;; These are defaults that are overwritten below in [Architecture]. | 1359 | ;; These are defaults that are overwritten below in [Architecture]. |