aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-20 00:16:54 +0000
committerMelanie2010-01-20 00:16:54 +0000
commit6c1dd2dfa7ed474b77cf47f55364d88f8dde7771 (patch)
tree6a99c57de59d2092a59aaddfcf745dbcbc7a0f07
parentConsole output no longer requires loglevel to be set to info; you can run the... (diff)
parentAdd OpenSim.Server.ini.example documentation for the new AllowDuplicateNames ... (diff)
downloadopensim-SC_OLD-6c1dd2dfa7ed474b77cf47f55364d88f8dde7771.zip
opensim-SC_OLD-6c1dd2dfa7ed474b77cf47f55364d88f8dde7771.tar.gz
opensim-SC_OLD-6c1dd2dfa7ed474b77cf47f55364d88f8dde7771.tar.bz2
opensim-SC_OLD-6c1dd2dfa7ed474b77cf47f55364d88f8dde7771.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--bin/OpenSim.Server.ini.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index d4e05af..372923b 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -80,4 +80,7 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
80StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 80StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
81ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;" 81ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
82Realm = "regions" 82Realm = "regions"
83
84; If true, duplicate region names are allowed on the grid. If false, no duplicate names are allowed
85; Default is false
83; AllowDuplicateNames = "True" 86; AllowDuplicateNames = "True"