From dcb9da8495f888f718090e4cc28393572928abff Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Jun 2010 06:55:34 -0700 Subject: This is RC2. *** Changed the MySql driver back to the old one.*** Removed Old Guids from connection strings. Merged master onto this branch. --- OpenSim/Framework/Servers/VersionInfo.cs | 2 +- bin/MySql.Data.dll | Bin 335872 -> 294912 bytes bin/OpenSim.ini.example | 2 +- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- bin/config-include/StandaloneCommon.ini.example | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index c27bc9a..448704d 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs @@ -30,7 +30,7 @@ namespace OpenSim public class VersionInfo { private const string VERSION_NUMBER = "0.7"; - private const Flavour VERSION_FLAVOUR = Flavour.RC1; + private const Flavour VERSION_FLAVOUR = Flavour.RC2; public enum Flavour { diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll index 7aa95ec..a94dd3d 100644 Binary files a/bin/MySql.Data.dll and b/bin/MySql.Data.dll differ diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f4d9a18..4dde96f 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -128,7 +128,7 @@ ; -->>> There are multiple connection strings defined in several places. Check it carefully! ; ; storage_plugin="OpenSim.Data.MySQL.dll" - ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"; + ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" ; If you want to use a different database/server for estate data, then ; uncomment and change this connect string. Defaults to the above if not set ; 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 6b0029f..5728038 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 [DatabaseService] StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" ; * As an example, the below configuration precisely mimicks the legacy ; * 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 8331db8..b02d47f 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -28,7 +28,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 [DatabaseService] StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" ; * 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 de8677f..6299485 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -17,7 +17,7 @@ ; Uncomment these lines if you want to use mysql storage ; Change the connection string to your db details ;StorageProvider = "OpenSim.Data.MySQL.dll" - ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" + ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" [AssetService] DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" -- cgit v1.1