diff options
author | Diva Canto | 2010-06-29 06:55:34 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-29 06:55:34 -0700 |
commit | dcb9da8495f888f718090e4cc28393572928abff (patch) | |
tree | f8b158ed53ad9428039d3eacc79fbbc08786d722 /bin | |
parent | Merge branch 'master' into 0.7-post-fixes (diff) | |
download | opensim-SC_OLD-dcb9da8495f888f718090e4cc28393572928abff.zip opensim-SC_OLD-dcb9da8495f888f718090e4cc28393572928abff.tar.gz opensim-SC_OLD-dcb9da8495f888f718090e4cc28393572928abff.tar.bz2 opensim-SC_OLD-dcb9da8495f888f718090e4cc28393572928abff.tar.xz |
This is RC2. *** Changed the MySql driver back to the old one.*** Removed Old Guids from connection strings.
Merged master onto this branch.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/MySql.Data.dll | bin | 335872 -> 294912 bytes | |||
-rw-r--r-- | bin/OpenSim.ini.example | 2 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
-rw-r--r-- | bin/Robust.ini.example | 2 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll index 7aa95ec..a94dd3d 100644 --- a/bin/MySql.Data.dll +++ b/bin/MySql.Data.dll | |||
Binary files 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 @@ | |||
128 | ; -->>> There are multiple connection strings defined in several places. Check it carefully! | 128 | ; -->>> There are multiple connection strings defined in several places. Check it carefully! |
129 | ; | 129 | ; |
130 | ; storage_plugin="OpenSim.Data.MySQL.dll" | 130 | ; storage_plugin="OpenSim.Data.MySQL.dll" |
131 | ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"; | 131 | ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" |
132 | ; If you want to use a different database/server for estate data, then | 132 | ; If you want to use a different database/server for estate data, then |
133 | ; uncomment and change this connect string. Defaults to the above if not set | 133 | ; uncomment and change this connect string. Defaults to the above if not set |
134 | ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; | 134 | ; 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 | |||
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=*****;Old Guids=true;" | 31 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" |
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 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 | |||
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=*****;Old Guids=true;" | 31 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;" |
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 de8677f..6299485 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=***;Old Guids=true;" | 20 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" |
21 | 21 | ||
22 | [AssetService] | 22 | [AssetService] |
23 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 23 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |