aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDan Lake2011-12-20 14:46:44 -0800
committerDan Lake2011-12-20 14:46:44 -0800
commit7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd (patch)
tree3de2f42376d23ead500098d98e6d2bbd6e21feda /bin
parentRemove unused SetAcceleration and add set on Acceleration parameter (diff)
parentRemove unused SetAcceleration and add set on Acceleration parameter (diff)
downloadopensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.zip
opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.gz
opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.bz2
opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index b6b1eb5..84611ec 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -13,7 +13,10 @@
13 ; Change the connection string to your db details 13 ; Change the connection string to your db details
14 ;StorageProvider = "OpenSim.Data.MySQL.dll" 14 ;StorageProvider = "OpenSim.Data.MySQL.dll"
15 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" 15 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
16 ; Uncomment this line if you are using MySQL and want to use a different database for estates 16
17 ; Uncomment this line if you are using MySQL and want to use a different database for estates.
18 ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
19 ; Most people won't need to do this so only uncomment if you know what you're doing.
17 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" 20 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
18 21
19 ; MSSQL 22 ; MSSQL