diff options
author | Jeff Ames | 2008-05-14 05:33:32 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-14 05:33:32 +0000 |
commit | 6a1b787436cc59043a26a296781e7a7b5ea0c67b (patch) | |
tree | 10f55a7b0abfdc47f103d40f13f3cae530c13581 /OpenSim/Data | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.zip opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.gz opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.bz2 opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.xz |
More formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MapperFactory/DataMapperFactory.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 3 |
4 files changed, 11 insertions, 5 deletions
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 | |||
41 | 41 | ||
42 | static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) | 42 | static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) |
43 | { | 43 | { |
44 | switch (type) { | 44 | switch (type) |
45 | { | ||
45 | case MAPPER_TYPE.MySQL: | 46 | case MAPPER_TYPE.MySQL: |
46 | return new MySQLDatabaseMapper(connectionString); | 47 | return new MySQLDatabaseMapper(connectionString); |
47 | case MAPPER_TYPE.MSSQL: | 48 | 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 | |||
174 | { | 174 | { |
175 | // TODO: This will let you pass in the connect string in | 175 | // TODO: This will let you pass in the connect string in |
176 | // the config, though someone will need to write that. | 176 | // the config, though someone will need to write that. |
177 | if (connect == String.Empty) { | 177 | if (connect == String.Empty) |
178 | { | ||
178 | // This is old seperate config file | 179 | // This is old seperate config file |
179 | Initialise(); | 180 | Initialise(); |
180 | } else { | 181 | } |
182 | else | ||
183 | { | ||
181 | _dbConnection = new MySQLManager(connect); | 184 | _dbConnection = new MySQLManager(connect); |
182 | TestTables(); | 185 | TestTables(); |
183 | } | 186 | } |
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 | |||
58 | 58 | ||
59 | override public void Initialise(string dbconnect) | 59 | override public void Initialise(string dbconnect) |
60 | { | 60 | { |
61 | if (dbconnect == string.Empty) { | 61 | if (dbconnect == string.Empty) |
62 | { | ||
62 | dbconnect = "URI=file:AssetStorage.db,version=3"; | 63 | dbconnect = "URI=file:AssetStorage.db,version=3"; |
63 | } | 64 | } |
64 | m_conn = new SqliteConnection(dbconnect); | 65 | 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 | |||
52 | /// </summary> | 52 | /// </summary> |
53 | public void Initialise(string dbconnect) | 53 | public void Initialise(string dbconnect) |
54 | { | 54 | { |
55 | if (dbconnect == string.Empty) { | 55 | if (dbconnect == string.Empty) |
56 | { | ||
56 | dbconnect = "URI=file:inventoryStore.db,version=3"; | 57 | dbconnect = "URI=file:inventoryStore.db,version=3"; |
57 | } | 58 | } |
58 | m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); | 59 | m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); |