From 6a1b787436cc59043a26a296781e7a7b5ea0c67b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 14 May 2008 05:33:32 +0000 Subject: More formatting cleanup. --- OpenSim/Data/MapperFactory/DataMapperFactory.cs | 3 ++- OpenSim/Data/MySQL/MySQLAssetData.cs | 7 +++++-- OpenSim/Data/SQLite/SQLiteAssetData.cs | 3 ++- OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MapperFactory/DataMapperFactory.cs b/OpenSim/Data/MapperFactory/DataMapperFactory.cs index c447be7..1d981f8 100644 --- a/OpenSim/Data/MapperFactory/DataMapperFactory.cs +++ b/OpenSim/Data/MapperFactory/DataMapperFactory.cs @@ -41,7 +41,8 @@ namespace OpenSim.Data.MapperFactory static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) { - switch (type) { + switch (type) + { case MAPPER_TYPE.MySQL: return new MySQLDatabaseMapper(connectionString); case MAPPER_TYPE.MSSQL: diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index efcf59e..7e6289b 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -174,10 +174,13 @@ namespace OpenSim.Data.MySQL { // TODO: This will let you pass in the connect string in // the config, though someone will need to write that. - if (connect == String.Empty) { + if (connect == String.Empty) + { // This is old seperate config file Initialise(); - } else { + } + else + { _dbConnection = new MySQLManager(connect); TestTables(); } diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index f3a4bd1..34329bb 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -58,7 +58,8 @@ namespace OpenSim.Data.SQLite override public void Initialise(string dbconnect) { - if (dbconnect == string.Empty) { + if (dbconnect == string.Empty) + { dbconnect = "URI=file:AssetStorage.db,version=3"; } m_conn = new SqliteConnection(dbconnect); diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 40978da..1ab971c 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs @@ -52,7 +52,8 @@ namespace OpenSim.Data.SQLite /// public void Initialise(string dbconnect) { - if (dbconnect == string.Empty) { + if (dbconnect == string.Empty) + { dbconnect = "URI=file:inventoryStore.db,version=3"; } m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); -- cgit v1.1