aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-06-13 03:56:47 +0100
committerMelanie2010-06-13 03:56:47 +0100
commitdeaf6bff985aa4a408575cc89e70366ccb79a723 (patch)
treea76e5365ff31edd14af54eeaa7c18fe33b7622e8 /bin
parentChange flavor to 0.7-RC1 (diff)
parentAdded Old Guids=true to all MySql connection strings. (diff)
downloadopensim-SC-deaf6bff985aa4a408575cc89e70366ccb79a723.zip
opensim-SC-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.gz
opensim-SC-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.bz2
opensim-SC-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.xz
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example2
-rw-r--r--bin/Robust.HG.ini.example2
-rw-r--r--bin/Robust.ini.example2
-rw-r--r--bin/config-include/StandaloneCommon.ini.example2
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b14206a..0bc3d87 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -126,7 +126,7 @@
126 ; -->>> There are multiple connection strings defined in several places. Check it carefully! 126 ; -->>> There are multiple connection strings defined in several places. Check it carefully!
127 ; 127 ;
128 ; storage_plugin="OpenSim.Data.MySQL.dll" 128 ; storage_plugin="OpenSim.Data.MySQL.dll"
129 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 129 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;";
130 ; If you want to use a different database/server for estate data, then 130 ; If you want to use a different database/server for estate data, then
131 ; uncomment and change this connect string. Defaults to the above if not set 131 ; uncomment and change this connect string. Defaults to the above if not set
132 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 132 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9af1e4c..2d69382 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -28,7 +28,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
28 28
29[DatabaseService] 29[DatabaseService]
30 StorageProvider = "OpenSim.Data.MySQL.dll" 30 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
32 32
33; * As an example, the below configuration precisely mimicks the legacy 33; * As an example, the below configuration precisely mimicks the legacy
34; * asset server. It is read by the asset IN connector (defined above) 34; * asset server. It is read by the asset IN connector (defined above)
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index f1b9126..8331db8 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -28,7 +28,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
28 28
29[DatabaseService] 29[DatabaseService]
30 StorageProvider = "OpenSim.Data.MySQL.dll" 30 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
32 32
33 33
34; * As an example, the below configuration precisely mimicks the legacy 34; * As an example, the below configuration precisely mimicks the legacy
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 572c153..bfa6725 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -17,7 +17,7 @@
17 ; Uncomment these lines if you want to use mysql storage 17 ; Uncomment these lines if you want to use mysql storage
18 ; Change the connection string to your db details 18 ; Change the connection string to your db details
19 ;StorageProvider = "OpenSim.Data.MySQL.dll" 19 ;StorageProvider = "OpenSim.Data.MySQL.dll"
20 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 20 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
21 21
22[AssetService] 22[AssetService]
23 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 23 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"