This is RC2. *** Changed the MySql driver back to the old one.*** Removed Old Guids from connection strings.
Merged master onto this branch.0.7-release
parent
1cd9118c7a
commit
dcb9da8495
|
@ -30,7 +30,7 @@ namespace OpenSim
|
||||||
public class VersionInfo
|
public class VersionInfo
|
||||||
{
|
{
|
||||||
private const string VERSION_NUMBER = "0.7";
|
private const string VERSION_NUMBER = "0.7";
|
||||||
private const Flavour VERSION_FLAVOUR = Flavour.RC1;
|
private const Flavour VERSION_FLAVOUR = Flavour.RC2;
|
||||||
|
|
||||||
public enum Flavour
|
public enum Flavour
|
||||||
{
|
{
|
||||||
|
|
Binary file not shown.
|
@ -128,7 +128,7 @@
|
||||||
; -->>> There are multiple connection strings defined in several places. Check it carefully!
|
; -->>> There are multiple connection strings defined in several places. Check it carefully!
|
||||||
;
|
;
|
||||||
; storage_plugin="OpenSim.Data.MySQL.dll"
|
; 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
|
; 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
|
; 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=*****;";
|
; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
|
||||||
|
|
|
@ -28,7 +28,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
|
|
||||||
[DatabaseService]
|
[DatabaseService]
|
||||||
StorageProvider = "OpenSim.Data.MySQL.dll"
|
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
|
; * As an example, the below configuration precisely mimicks the legacy
|
||||||
; * asset server. It is read by the asset IN connector (defined above)
|
; * asset server. It is read by the asset IN connector (defined above)
|
||||||
|
|
|
@ -28,7 +28,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
|
||||||
|
|
||||||
[DatabaseService]
|
[DatabaseService]
|
||||||
StorageProvider = "OpenSim.Data.MySQL.dll"
|
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
|
; * As an example, the below configuration precisely mimicks the legacy
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
; Uncomment these lines if you want to use mysql storage
|
; Uncomment these lines if you want to use mysql storage
|
||||||
; Change the connection string to your db details
|
; Change the connection string to your db details
|
||||||
;StorageProvider = "OpenSim.Data.MySQL.dll"
|
;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]
|
[AssetService]
|
||||||
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
|
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
|
||||||
|
|
Loading…
Reference in New Issue