aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-01 13:27:40 +0000
committerJustin Clarke Casey2008-05-01 13:27:40 +0000
commitd72bdf432a622f237b3030c1da9d1bccca20f83c (patch)
tree80b72df740a2858ac9ca8c3707ef45ff81488f67 /OpenSim
parent* Change mysql inventory items table version 3 upgrade sql to provide explici... (diff)
downloadopensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.zip
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.gz
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.bz2
opensim-SC_OLD-d72bdf432a622f237b3030c1da9d1bccca20f83c.tar.xz
* Align new fields upgrade sql to have the same 'not null' and default settings as when an inventoryitems table is newly created
* Normalize logging titles in database code, though this doesn't yet cover invoking code
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs30
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs46
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs2
-rw-r--r--OpenSim/Data/MySQL/Resources/CreateItemsTable.sql12
-rw-r--r--OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql2
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs10
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs56
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs16
14 files changed, 98 insertions, 98 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index d837e4e..5ae60a1 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.MSSQL
49 // null as the version, indicates that the table didn't exist 49 // null as the version, indicates that the table didn't exist
50 if (tableName == null) 50 if (tableName == null)
51 { 51 {
52 m_log.Info("[ASSETS]: Creating new database tables"); 52 m_log.Info("[ASSET DB]: Creating new database tables");
53 database.ExecuteResourceSql("CreateAssetsTable.sql"); 53 database.ExecuteResourceSql("CreateAssetsTable.sql");
54 return; 54 return;
55 } 55 }
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index dd3d20e..82aab13 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Data.MSSQL
84 m_dataSet = new DataSet(); 84 m_dataSet = new DataSet();
85 this.persistPrimInventories = persistPrimInventories; 85 this.persistPrimInventories = persistPrimInventories;
86 86
87 m_log.Info("[DATASTORE]: MSSql - connecting: " + connectionString); 87 m_log.Info("[REGION DB]: MSSql - connecting: " + connectionString);
88 m_connection = new SqlConnection(connectionString); 88 m_connection = new SqlConnection(connectionString);
89 89
90 SqlCommand primSelectCmd = new SqlCommand(m_primSelect, m_connection); 90 SqlCommand primSelectCmd = new SqlCommand(m_primSelect, m_connection);
@@ -154,7 +154,7 @@ namespace OpenSim.Data.MSSQL
154 { 154 {
155 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0) 155 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0)
156 { 156 {
157 m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 157 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
158 addPrim(prim, obj.UUID, regionUUID); 158 addPrim(prim, obj.UUID, regionUUID);
159 } 159 }
160 else 160 else
@@ -171,7 +171,7 @@ namespace OpenSim.Data.MSSQL
171 { 171 {
172 // Instance.RemoveObject(obj, regionUUID); 172 // Instance.RemoveObject(obj, regionUUID);
173 173
174 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 174 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
175 175
176 DataTable prims = m_primTable; 176 DataTable prims = m_primTable;
177 DataTable shapes = m_shapeTable; 177 DataTable shapes = m_shapeTable;
@@ -238,7 +238,7 @@ namespace OpenSim.Data.MSSQL
238 lock (m_dataSet) 238 lock (m_dataSet)
239 { 239 {
240 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); 240 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent);
241 m_log.Info("[DATASTORE]: " + 241 m_log.Info("[REGION DB]: " +
242 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); 242 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
243 243
244 foreach (DataRow primRow in primsForRegion) 244 foreach (DataRow primRow in primsForRegion)
@@ -342,7 +342,7 @@ namespace OpenSim.Data.MSSQL
342 public void StoreTerrain(double[,] ter, LLUUID regionID) 342 public void StoreTerrain(double[,] ter, LLUUID regionID)
343 { 343 {
344 int revision = Util.UnixTimeSinceEpoch(); 344 int revision = Util.UnixTimeSinceEpoch();
345 m_log.Info("[DATASTORE]: Storing terrain revision r" + revision.ToString()); 345 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
346 346
347 DataTable terrain = m_dataSet.Tables["terrain"]; 347 DataTable terrain = m_dataSet.Tables["terrain"];
348 lock (m_dataSet) 348 lock (m_dataSet)
@@ -395,11 +395,11 @@ namespace OpenSim.Data.MSSQL
395 } 395 }
396 else 396 else
397 { 397 {
398 m_log.Info("[DATASTORE]: No terrain found for region"); 398 m_log.Info("[REGION DB]: No terrain found for region");
399 return null; 399 return null;
400 } 400 }
401 401
402 m_log.Info("[DATASTORE]: Loaded terrain revision r" + rev.ToString()); 402 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
403 } 403 }
404 404
405 return terret; 405 return terret;
@@ -1200,7 +1200,7 @@ namespace OpenSim.Data.MSSQL
1200 if (!persistPrimInventories) 1200 if (!persistPrimInventories)
1201 return; 1201 return;
1202 1202
1203 m_log.InfoFormat("[DATASTORE]: Persisting Prim Inventory with prim ID {0}", primID); 1203 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
1204 1204
1205 // For now, we're just going to crudely remove all the previous inventory items 1205 // For now, we're just going to crudely remove all the previous inventory items
1206 // no matter whether they have changed or not, and replace them with the current set. 1206 // no matter whether they have changed or not, and replace them with the current set.
@@ -1212,7 +1212,7 @@ namespace OpenSim.Data.MSSQL
1212 foreach (TaskInventoryItem newItem in items) 1212 foreach (TaskInventoryItem newItem in items)
1213 { 1213 {
1214 // m_log.InfoFormat( 1214 // m_log.InfoFormat(
1215 // "[DATASTORE]: " + 1215 // "[REGION DB]: " +
1216 // "Adding item {0}, {1} to prim ID {2}", 1216 // "Adding item {0}, {1} to prim ID {2}",
1217 // newItem.Name, newItem.ItemID, newItem.ParentPartID); 1217 // newItem.Name, newItem.ItemID, newItem.ParentPartID);
1218 1218
@@ -1516,7 +1516,7 @@ namespace OpenSim.Data.MSSQL
1516 } 1516 }
1517 catch (SqlException) 1517 catch (SqlException)
1518 { 1518 {
1519 m_log.Info("[DATASTORE]: MySql Database doesn't exist... creating"); 1519 m_log.Info("[REGION DB]: MySql Database doesn't exist... creating");
1520 InitDB(conn); 1520 InitDB(conn);
1521 } 1521 }
1522 1522
@@ -1534,7 +1534,7 @@ namespace OpenSim.Data.MSSQL
1534 { 1534 {
1535 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName)) 1535 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName))
1536 { 1536 {
1537 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1537 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1538 return false; 1538 return false;
1539 } 1539 }
1540 } 1540 }
@@ -1543,7 +1543,7 @@ namespace OpenSim.Data.MSSQL
1543 { 1543 {
1544 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName)) 1544 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName))
1545 { 1545 {
1546 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1546 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1547 return false; 1547 return false;
1548 } 1548 }
1549 } 1549 }
@@ -1554,7 +1554,7 @@ namespace OpenSim.Data.MSSQL
1554 { 1554 {
1555 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName)) 1555 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName))
1556 { 1556 {
1557 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1557 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1558 return false; 1558 return false;
1559 } 1559 }
1560 } 1560 }
@@ -1563,7 +1563,7 @@ namespace OpenSim.Data.MSSQL
1563 { 1563 {
1564 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName)) 1564 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName))
1565 { 1565 {
1566 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1566 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1567 return false; 1567 return false;
1568 } 1568 }
1569 } 1569 }
@@ -1572,7 +1572,7 @@ namespace OpenSim.Data.MSSQL
1572 { 1572 {
1573 if (!tmpDS.Tables["landaccesslist"].Columns.Contains(col.ColumnName)) 1573 if (!tmpDS.Tables["landaccesslist"].Columns.Contains(col.ColumnName))
1574 { 1574 {
1575 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1575 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1576 return false; 1576 return false;
1577 } 1577 }
1578 } 1578 }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 3d859ff..3330732 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Data.MSSQL
87 } 87 }
88 catch (Exception) 88 catch (Exception)
89 { 89 {
90 m_log.Info("[DATASTORE]: MSSQL Database doesn't exist... creating"); 90 m_log.Info("[GRID DB]: MSSQL Database doesn't exist... creating");
91 database.ExecuteResourceSql("Mssql-regions.sql"); 91 database.ExecuteResourceSql("Mssql-regions.sql");
92 } 92 }
93 } 93 }
@@ -217,7 +217,7 @@ namespace OpenSim.Data.MSSQL
217 } 217 }
218 else 218 else
219 { 219 {
220 m_log.Error("[DATABASE]: Searched for a Region Name shorter then 3 characters"); 220 m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters");
221 return null; 221 return null;
222 } 222 }
223 } 223 }
@@ -380,7 +380,7 @@ namespace OpenSim.Data.MSSQL
380 } 380 }
381 catch (Exception e) 381 catch (Exception e)
382 { 382 {
383 m_log.Error("MSSQLManager : " + e.ToString()); 383 m_log.Error("[GRID DB]: " + e.ToString());
384 } 384 }
385 385
386 return returnval; 386 return returnval;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index b4a9191..efcf59e 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.MySQL
49 // null as the version, indicates that the table didn't exist 49 // null as the version, indicates that the table didn't exist
50 if (oldVersion == null) 50 if (oldVersion == null)
51 { 51 {
52 m_log.Info("[ASSETS]: Creating new database tables"); 52 m_log.Info("[ASSETS DB]: Creating new database tables");
53 _dbConnection.ExecuteResourceSql("CreateAssetsTable.sql"); 53 _dbConnection.ExecuteResourceSql("CreateAssetsTable.sql");
54 return; 54 return;
55 } 55 }
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MySQL
102 catch (Exception e) 102 catch (Exception e)
103 { 103 {
104 m_log.ErrorFormat( 104 m_log.ErrorFormat(
105 "[ASSETS]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString() 105 "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
106 + Environment.NewLine + "Attempting reconnection", assetID); 106 + Environment.NewLine + "Attempting reconnection", assetID);
107 _dbConnection.Reconnect(); 107 _dbConnection.Reconnect();
108 } 108 }
@@ -141,7 +141,7 @@ namespace OpenSim.Data.MySQL
141 catch (Exception e) 141 catch (Exception e)
142 { 142 {
143 m_log.ErrorFormat( 143 m_log.ErrorFormat(
144 "[ASSETS]: " + 144 "[ASSETS DB]: " +
145 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() 145 "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString()
146 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); 146 + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
147 _dbConnection.Reconnect(); 147 _dbConnection.Reconnect();
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 1f9ea70..33981de 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MySQL
88 m_dataSet = new DataSet(); 88 m_dataSet = new DataSet();
89 this.persistPrimInventories = persistPrimInventories; 89 this.persistPrimInventories = persistPrimInventories;
90 90
91 m_log.Info("[DATASTORE]: MySql - connecting: " + connectionstring); 91 m_log.Info("[REGION DB]: MySql - connecting: " + connectionstring);
92 m_connection = new MySqlConnection(connectionstring); 92 m_connection = new MySqlConnection(connectionstring);
93 93
94 TestTablesVersionable(m_connection); 94 TestTablesVersionable(m_connection);
@@ -256,7 +256,7 @@ namespace OpenSim.Data.MySQL
256 { 256 {
257 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) 257 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0)
258 { 258 {
259 m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 259 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
260 addPrim(prim, obj.UUID, regionUUID); 260 addPrim(prim, obj.UUID, regionUUID);
261 } 261 }
262 else 262 else
@@ -270,7 +270,7 @@ namespace OpenSim.Data.MySQL
270 270
271 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 271 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
272 { 272 {
273 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 273 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
274 274
275 DataTable prims = m_primTable; 275 DataTable prims = m_primTable;
276 DataTable shapes = m_shapeTable; 276 DataTable shapes = m_shapeTable;
@@ -334,7 +334,7 @@ namespace OpenSim.Data.MySQL
334 lock (m_dataSet) 334 lock (m_dataSet)
335 { 335 {
336 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); 336 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent);
337 m_log.Info("[DATASTORE]: " + 337 m_log.Info("[REGION DB]: " +
338 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); 338 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
339 339
340 foreach (DataRow primRow in primsForRegion) 340 foreach (DataRow primRow in primsForRegion)
@@ -390,11 +390,11 @@ namespace OpenSim.Data.MySQL
390 } 390 }
391 catch (Exception e) 391 catch (Exception e)
392 { 392 {
393 m_log.Error("[DATASTORE]: Failed create prim object, exception and data follows"); 393 m_log.Error("[REGION DB]: Failed create prim object, exception and data follows");
394 m_log.Info("[DATASTORE]: " + e.ToString()); 394 m_log.Info("[REGION DB]: " + e.ToString());
395 foreach (DataColumn col in prims.Columns) 395 foreach (DataColumn col in prims.Columns)
396 { 396 {
397 m_log.Info("[DATASTORE]: Col: " + col.ColumnName + " => " + primRow[col]); 397 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
398 } 398 }
399 } 399 }
400 } 400 }
@@ -438,7 +438,7 @@ namespace OpenSim.Data.MySQL
438 public void StoreTerrain(double[,] ter, LLUUID regionID) 438 public void StoreTerrain(double[,] ter, LLUUID regionID)
439 { 439 {
440 int revision = Util.UnixTimeSinceEpoch(); 440 int revision = Util.UnixTimeSinceEpoch();
441 m_log.Info("[DATASTORE]: Storing terrain revision r" + revision.ToString()); 441 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
442 442
443 DataTable terrain = m_dataSet.Tables["terrain"]; 443 DataTable terrain = m_dataSet.Tables["terrain"];
444 lock (m_dataSet) 444 lock (m_dataSet)
@@ -493,11 +493,11 @@ namespace OpenSim.Data.MySQL
493 } 493 }
494 else 494 else
495 { 495 {
496 m_log.Info("[DATASTORE]: No terrain found for region"); 496 m_log.Info("[REGION DB]: No terrain found for region");
497 return null; 497 return null;
498 } 498 }
499 499
500 m_log.Info("[DATASTORE]: Loaded terrain revision r" + rev.ToString()); 500 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
501 } 501 }
502 } 502 }
503 return terret; 503 return terret;
@@ -1329,7 +1329,7 @@ namespace OpenSim.Data.MySQL
1329 if (!persistPrimInventories) 1329 if (!persistPrimInventories)
1330 return; 1330 return;
1331 1331
1332 m_log.InfoFormat("[DATASTORE]: Persisting Prim Inventory with prim ID {0}", primID); 1332 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
1333 1333
1334 // For now, we're just going to crudely remove all the previous inventory items 1334 // For now, we're just going to crudely remove all the previous inventory items
1335 // no matter whether they have changed or not, and replace them with the current set. 1335 // no matter whether they have changed or not, and replace them with the current set.
@@ -1341,7 +1341,7 @@ namespace OpenSim.Data.MySQL
1341 foreach (TaskInventoryItem newItem in items) 1341 foreach (TaskInventoryItem newItem in items)
1342 { 1342 {
1343// m_log.InfoFormat( 1343// m_log.InfoFormat(
1344// "[DATASTORE]: " + 1344// "[REGION DB]: " +
1345// "Adding item {0}, {1} to prim ID {2}", 1345// "Adding item {0}, {1} to prim ID {2}",
1346// newItem.Name, newItem.ItemID, newItem.ParentPartID); 1346// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1347 1347
@@ -1572,8 +1572,8 @@ namespace OpenSim.Data.MySQL
1572 } 1572 }
1573 catch (Exception ex) 1573 catch (Exception ex)
1574 { 1574 {
1575 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message); 1575 m_log.Error("[REGION DB]: Error connecting to MySQL server: " + ex.Message);
1576 m_log.Error("[MySql]: Application is terminating!"); 1576 m_log.Error("[REGION DB]: Application is terminating!");
1577 Thread.CurrentThread.Abort(); 1577 Thread.CurrentThread.Abort();
1578 } 1578 }
1579 } 1579 }
@@ -1584,7 +1584,7 @@ namespace OpenSim.Data.MySQL
1584 } 1584 }
1585 catch (MySqlException e) 1585 catch (MySqlException e)
1586 { 1586 {
1587 m_log.WarnFormat("[MySql]: Primitives Table Already Exists: {0}", e); 1587 m_log.WarnFormat("[REGION DB]: Primitives Table Already Exists: {0}", e);
1588 } 1588 }
1589 1589
1590 try 1590 try
@@ -1593,7 +1593,7 @@ namespace OpenSim.Data.MySQL
1593 } 1593 }
1594 catch (MySqlException e) 1594 catch (MySqlException e)
1595 { 1595 {
1596 m_log.WarnFormat("[MySql]: Shapes Table Already Exists: {0}", e); 1596 m_log.WarnFormat("[REGION DB]: Shapes Table Already Exists: {0}", e);
1597 } 1597 }
1598 1598
1599 try 1599 try
@@ -1602,7 +1602,7 @@ namespace OpenSim.Data.MySQL
1602 } 1602 }
1603 catch (MySqlException e) 1603 catch (MySqlException e)
1604 { 1604 {
1605 m_log.WarnFormat("[MySql]: Items Table Already Exists: {0}", e); 1605 m_log.WarnFormat("[REGION DB]: Items Table Already Exists: {0}", e);
1606 } 1606 }
1607 1607
1608 try 1608 try
@@ -1611,7 +1611,7 @@ namespace OpenSim.Data.MySQL
1611 } 1611 }
1612 catch (MySqlException e) 1612 catch (MySqlException e)
1613 { 1613 {
1614 m_log.WarnFormat("[MySql]: Terrain Table Already Exists: {0}", e); 1614 m_log.WarnFormat("[REGION DB]: Terrain Table Already Exists: {0}", e);
1615 } 1615 }
1616 1616
1617 //try 1617 //try
@@ -1629,7 +1629,7 @@ namespace OpenSim.Data.MySQL
1629 } 1629 }
1630 catch (MySqlException e) 1630 catch (MySqlException e)
1631 { 1631 {
1632 m_log.WarnFormat("[MySql]: LandAccessList Table Already Exists: {0}", e); 1632 m_log.WarnFormat("[REGION DB]: LandAccessList Table Already Exists: {0}", e);
1633 } 1633 }
1634 conn.Close(); 1634 conn.Close();
1635 } 1635 }
@@ -1682,7 +1682,7 @@ namespace OpenSim.Data.MySQL
1682 { 1682 {
1683 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName)) 1683 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName))
1684 { 1684 {
1685 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1685 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1686 return false; 1686 return false;
1687 } 1687 }
1688 } 1688 }
@@ -1691,7 +1691,7 @@ namespace OpenSim.Data.MySQL
1691 { 1691 {
1692 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName)) 1692 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName))
1693 { 1693 {
1694 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1694 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1695 return false; 1695 return false;
1696 } 1696 }
1697 } 1697 }
@@ -1702,7 +1702,7 @@ namespace OpenSim.Data.MySQL
1702 { 1702 {
1703 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName)) 1703 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName))
1704 { 1704 {
1705 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1705 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1706 return false; 1706 return false;
1707 } 1707 }
1708 } 1708 }
@@ -1711,7 +1711,7 @@ namespace OpenSim.Data.MySQL
1711 { 1711 {
1712 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName)) 1712 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName))
1713 { 1713 {
1714 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1714 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1715 return false; 1715 return false;
1716 } 1716 }
1717 } 1717 }
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index b6274d4..df52ae0 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MySQL
284 } 284 }
285 else 285 else
286 { 286 {
287 m_log.Error("[DATABASE]: Searched for a Region Name shorter then 3 characters"); 287 m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters");
288 return null; 288 return null;
289 } 289 }
290 } 290 }
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index d522b78..c62cfa7 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
89 } 89 }
90 catch(Exception e) 90 catch(Exception e)
91 { 91 {
92 throw new Exception( "Connection error while using connection string ["+connectionString+"]", e ); 92 throw new Exception("Connection error while using connection string ["+connectionString+"]", e);
93 } 93 }
94 94
95 m_log.Info("[MYSQL]: Connection established"); 95 m_log.Info("[MYSQL]: Connection established");
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 66b65dc..382d69c 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -346,7 +346,7 @@ namespace OpenSim.Data.MySQL
346 346
347 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) 347 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
348 { 348 {
349 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 349 m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
350 } 350 }
351 351
352 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 352 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
diff --git a/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql b/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
index 24ebccd..ffdbe17 100644
--- a/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
+++ b/OpenSim/Data/MySQL/Resources/CreateItemsTable.sql
@@ -12,12 +12,12 @@ CREATE TABLE `inventoryitems` (
12 `creatorID` varchar(36) default NULL, 12 `creatorID` varchar(36) default NULL,
13 `inventoryBasePermissions` int(10) unsigned NOT NULL default 0, 13 `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
14 `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0, 14 `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
15 `salePrice` int(11) default NULL, 15 `salePrice` int(11) NOT NULL default 0,
16 `saleType` tinyint(4) default NULL, 16 `saleType` tinyint(4) NOT NULL default 0,
17 `creationDate` int(11) default NULL, 17 `creationDate` int(11) NOT NULL default 0,
18 `groupID` varchar(36) default NULL, 18 `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
19 `groupOwned` tinyint(4) default NULL, 19 `groupOwned` tinyint(4) NOT NULL default 0,
20 `flags` int(11) unsigned default NULL, 20 `flags` int(11) unsigned NOT NULL default 0,
21 PRIMARY KEY (`inventoryID`), 21 PRIMARY KEY (`inventoryID`),
22 KEY `owner` (`avatarID`), 22 KEY `owner` (`avatarID`),
23 KEY `folder` (`parentFolderID`) 23 KEY `folder` (`parentFolderID`)
diff --git a/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql b/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
index 5bd6994..b4108ab 100644
--- a/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
+++ b/OpenSim/Data/MySQL/Resources/UpgradeItemsTableToVersion3.sql
@@ -1,7 +1,7 @@
1ALTER TABLE `inventoryitems` 1ALTER TABLE `inventoryitems`
2 ADD COLUMN `salePrice` int(11) NOT NULL default 0, 2 ADD COLUMN `salePrice` int(11) NOT NULL default 0,
3 ADD COLUMN `saleType` tinyint(4) NOT NULL default 0, 3 ADD COLUMN `saleType` tinyint(4) NOT NULL default 0,
4 ADD COLUMN `creationDate` int(11) NOT NULL default 3000, 4 ADD COLUMN `creationDate` int(11) NOT NULL default 0,
5 ADD COLUMN `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000', 5 ADD COLUMN `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
6 ADD COLUMN `groupOwned` tinyint(4) NOT NULL default 0, 6 ADD COLUMN `groupOwned` tinyint(4) NOT NULL default 0,
7 ADD COLUMN `flags` int(11) unsigned NOT NULL default 0, 7 ADD COLUMN `flags` int(11) unsigned NOT NULL default 0,
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 0d8b468..db4848a 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -92,10 +92,10 @@ namespace OpenSim.Data.SQLite
92 92
93 override public void CreateAsset(AssetBase asset) 93 override public void CreateAsset(AssetBase asset)
94 { 94 {
95 m_log.Info("[SQLITE]: Creating Asset " + Util.ToRawUuidString(asset.FullID)); 95 m_log.Info("[ASSET DB]: Creating Asset " + Util.ToRawUuidString(asset.FullID));
96 if (ExistsAsset(asset.FullID)) 96 if (ExistsAsset(asset.FullID))
97 { 97 {
98 m_log.Info("[SQLITE]: Asset exists already, ignoring."); 98 m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
99 } 99 }
100 else 100 else
101 { 101 {
@@ -142,7 +142,7 @@ namespace OpenSim.Data.SQLite
142 142
143 int assetLength = (asset.Data != null) ? asset.Data.Length : 0; 143 int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
144 144
145 m_log.Info("[SQLITE]: " + 145 m_log.Info("[ASSET DB]: " +
146 string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)", 146 string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
147 asset.FullID, asset.Name, asset.Description, asset.Type, 147 asset.FullID, asset.Name, asset.Description, asset.Type,
148 asset.InvType, temporary, local, assetLength)); 148 asset.InvType, temporary, local, assetLength));
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
181 181
182 override public void CommitAssets() // force a sync to the database 182 override public void CommitAssets() // force a sync to the database
183 { 183 {
184 m_log.Info("[SQLITE]: Attempting commit"); 184 m_log.Info("[ASSET DB]: Attempting commit");
185 // lock (ds) 185 // lock (ds)
186 // { 186 // {
187 // da.Update(ds, "assets"); 187 // da.Update(ds, "assets");
@@ -268,7 +268,7 @@ namespace OpenSim.Data.SQLite
268 } 268 }
269 catch (SqliteSyntaxException) 269 catch (SqliteSyntaxException)
270 { 270 {
271 m_log.Info("[SQLITE]: SQLite Database doesn't exist... creating"); 271 m_log.Info("[ASSET DB]: SQLite Database doesn't exist... creating");
272 InitDB(conn); 272 InitDB(conn);
273 } 273 }
274 return true; 274 return true;
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 1c60938..4b28795 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Data.SQLite
210 if (inventoryRow == null) 210 if (inventoryRow == null)
211 { 211 {
212 if (! add) 212 if (! add)
213 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID); 213 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
214 214
215 inventoryRow = inventoryItemTable.NewRow(); 215 inventoryRow = inventoryItemTable.NewRow();
216 fillItemRow(inventoryRow, item); 216 fillItemRow(inventoryRow, item);
@@ -219,7 +219,7 @@ namespace OpenSim.Data.SQLite
219 else 219 else
220 { 220 {
221 if (add) 221 if (add)
222 m_log.ErrorFormat("Interface Misuse: Attempting to Add inventory item that already exists: {0}", item.ID); 222 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Add inventory item that already exists: {0}", item.ID);
223 223
224 fillItemRow(inventoryRow, item); 224 fillItemRow(inventoryRow, item);
225 } 225 }
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b6463f3..5a3d350 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Data.SQLite
79 79
80 ds = new DataSet(); 80 ds = new DataSet();
81 81
82 m_log.Info("[DATASTORE]: Sqlite - connecting: " + connectionString); 82 m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
83 m_conn = new SqliteConnection(m_connectionString); 83 m_conn = new SqliteConnection(m_connectionString);
84 m_conn.Open(); 84 m_conn.Open();
85 85
@@ -143,7 +143,7 @@ namespace OpenSim.Data.SQLite
143 } 143 }
144 catch (Exception) 144 catch (Exception)
145 { 145 {
146 m_log.Info("[DATASTORE]: Caught fill error on primshapes table"); 146 m_log.Info("[REGION DB]: Caught fill error on primshapes table");
147 } 147 }
148 148
149 try 149 try
@@ -152,7 +152,7 @@ namespace OpenSim.Data.SQLite
152 } 152 }
153 catch (Exception) 153 catch (Exception)
154 { 154 {
155 m_log.Info("[DATASTORE]: Caught fill error on terrain table"); 155 m_log.Info("[REGION DB]: Caught fill error on terrain table");
156 } 156 }
157 157
158 try 158 try
@@ -161,7 +161,7 @@ namespace OpenSim.Data.SQLite
161 } 161 }
162 catch (Exception) 162 catch (Exception)
163 { 163 {
164 m_log.Info("[DATASTORE]: Caught fill error on land table"); 164 m_log.Info("[REGION DB]: Caught fill error on land table");
165 } 165 }
166 166
167 try 167 try
@@ -170,7 +170,7 @@ namespace OpenSim.Data.SQLite
170 } 170 }
171 catch (Exception) 171 catch (Exception)
172 { 172 {
173 m_log.Info("[DATASTORE]: Caught fill error on landaccesslist table"); 173 m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
174 } 174 }
175 return; 175 return;
176 } 176 }
@@ -184,7 +184,7 @@ namespace OpenSim.Data.SQLite
184 { 184 {
185 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) 185 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0)
186 { 186 {
187 m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 187 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
188 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); 188 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
189 } 189 }
190 else if (prim.Stopped) 190 else if (prim.Stopped)
@@ -206,7 +206,7 @@ namespace OpenSim.Data.SQLite
206 206
207 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 207 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
208 { 208 {
209 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 209 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
210 210
211 DataTable prims = ds.Tables["prims"]; 211 DataTable prims = ds.Tables["prims"];
212 DataTable shapes = ds.Tables["primshapes"]; 212 DataTable shapes = ds.Tables["primshapes"];
@@ -275,7 +275,7 @@ namespace OpenSim.Data.SQLite
275 lock (ds) 275 lock (ds)
276 { 276 {
277 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); 277 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent);
278 m_log.Info("[DATASTORE]: " + 278 m_log.Info("[REGION DB]: " +
279 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); 279 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
280 280
281 foreach (DataRow primRow in primsForRegion) 281 foreach (DataRow primRow in primsForRegion)
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
298 else 298 else
299 { 299 {
300 m_log.Info( 300 m_log.Info(
301 "No shape found for prim in storage, so setting default box shape"); 301 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
302 prim.Shape = PrimitiveBaseShape.Default; 302 prim.Shape = PrimitiveBaseShape.Default;
303 } 303 }
304 group.AddPart(prim); 304 group.AddPart(prim);
@@ -318,7 +318,7 @@ namespace OpenSim.Data.SQLite
318 else 318 else
319 { 319 {
320 m_log.Info( 320 m_log.Info(
321 "No shape found for prim in storage, so setting default box shape"); 321 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
322 prim.Shape = PrimitiveBaseShape.Default; 322 prim.Shape = PrimitiveBaseShape.Default;
323 } 323 }
324 createdObjects[new LLUUID(objID)].AddPart(prim); 324 createdObjects[new LLUUID(objID)].AddPart(prim);
@@ -331,11 +331,11 @@ namespace OpenSim.Data.SQLite
331 } 331 }
332 catch (Exception e) 332 catch (Exception e)
333 { 333 {
334 m_log.Error("[DATASTORE]: Failed create prim object, exception and data follows"); 334 m_log.Error("[REGION DB]: Failed create prim object, exception and data follows");
335 m_log.Info("[DATASTORE]: " + e.ToString()); 335 m_log.Info("[REGION DB]: " + e.ToString());
336 foreach (DataColumn col in prims.Columns) 336 foreach (DataColumn col in prims.Columns)
337 { 337 {
338 m_log.Info("[DATASTORE]: Col: " + col.ColumnName + " => " + primRow[col]); 338 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
339 } 339 }
340 } 340 }
341 } 341 }
@@ -384,7 +384,7 @@ namespace OpenSim.Data.SQLite
384 384
385 // the following is an work around for .NET. The perf 385 // the following is an work around for .NET. The perf
386 // issues associated with it aren't as bad as you think. 386 // issues associated with it aren't as bad as you think.
387 m_log.Info("[DATASTORE]: Storing terrain revision r" + revision.ToString()); 387 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
388 String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" + 388 String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
389 " values(:RegionUUID, :Revision, :Heightfield)"; 389 " values(:RegionUUID, :Revision, :Heightfield)";
390 390
@@ -448,11 +448,11 @@ namespace OpenSim.Data.SQLite
448 } 448 }
449 else 449 else
450 { 450 {
451 m_log.Info("[DATASTORE]: No terrain found for region"); 451 m_log.Info("[REGION DB]: No terrain found for region");
452 return null; 452 return null;
453 } 453 }
454 454
455 m_log.Info("[DATASTORE]: Loaded terrain revision r" + rev.ToString()); 455 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
456 } 456 }
457 } 457 }
458 return terret; 458 return terret;
@@ -988,7 +988,7 @@ namespace OpenSim.Data.SQLite
988 m_conn.Close(); 988 m_conn.Close();
989 m_conn.Dispose(); 989 m_conn.Dispose();
990 990
991 m_log.Error("[SQLITE]: The land table was recently updated. You need to restart the simulator. Exiting now."); 991 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator. Exiting now.");
992 992
993 System.Threading.Thread.Sleep(10000); 993 System.Threading.Thread.Sleep(10000);
994 994
@@ -999,7 +999,7 @@ namespace OpenSim.Data.SQLite
999 catch (System.Exception) 999 catch (System.Exception)
1000 { 1000 {
1001 // ICK! but it's better then A thousand red SQLITE error messages! 1001 // ICK! but it's better then A thousand red SQLITE error messages!
1002 m_log.Error("[SQLITE]: The land table was recently updated. You need to restart the simulator"); 1002 m_log.Error("[REGION DB]: The land table was recently updated. You need to restart the simulator");
1003 Environment.Exit(0); 1003 Environment.Exit(0);
1004 } 1004 }
1005 } 1005 }
@@ -1314,7 +1314,7 @@ namespace OpenSim.Data.SQLite
1314 if (!persistPrimInventories) 1314 if (!persistPrimInventories)
1315 return; 1315 return;
1316 1316
1317 m_log.InfoFormat("[DATASTORE]: Entered StorePrimInventory with prim ID {0}", primID); 1317 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
1318 1318
1319 DataTable dbItems = ds.Tables["primitems"]; 1319 DataTable dbItems = ds.Tables["primitems"];
1320 1320
@@ -1555,7 +1555,7 @@ namespace OpenSim.Data.SQLite
1555 } 1555 }
1556 catch (SqliteSyntaxException) 1556 catch (SqliteSyntaxException)
1557 { 1557 {
1558 m_log.Warn("[SQLITE]: Primitives Table Already Exists"); 1558 m_log.Warn("[REGION DB]: Primitives Table Already Exists");
1559 } 1559 }
1560 1560
1561 try 1561 try
@@ -1564,7 +1564,7 @@ namespace OpenSim.Data.SQLite
1564 } 1564 }
1565 catch (SqliteSyntaxException) 1565 catch (SqliteSyntaxException)
1566 { 1566 {
1567 m_log.Warn("[SQLITE]: Shapes Table Already Exists"); 1567 m_log.Warn("[REGION DB]: Shapes Table Already Exists");
1568 } 1568 }
1569 1569
1570 if (persistPrimInventories) 1570 if (persistPrimInventories)
@@ -1575,7 +1575,7 @@ namespace OpenSim.Data.SQLite
1575 } 1575 }
1576 catch (SqliteSyntaxException) 1576 catch (SqliteSyntaxException)
1577 { 1577 {
1578 m_log.Warn("[SQLITE]: Primitives Inventory Table Already Exists"); 1578 m_log.Warn("[REGION DB]: Primitives Inventory Table Already Exists");
1579 } 1579 }
1580 } 1580 }
1581 1581
@@ -1585,7 +1585,7 @@ namespace OpenSim.Data.SQLite
1585 } 1585 }
1586 catch (SqliteSyntaxException) 1586 catch (SqliteSyntaxException)
1587 { 1587 {
1588 m_log.Warn("[SQLITE]: Terrain Table Already Exists"); 1588 m_log.Warn("[REGION DB]: Terrain Table Already Exists");
1589 } 1589 }
1590 1590
1591 try 1591 try
@@ -1594,7 +1594,7 @@ namespace OpenSim.Data.SQLite
1594 } 1594 }
1595 catch (SqliteSyntaxException) 1595 catch (SqliteSyntaxException)
1596 { 1596 {
1597 m_log.Warn("[SQLITE]: Land Table Already Exists"); 1597 m_log.Warn("[REGION DB]: Land Table Already Exists");
1598 } 1598 }
1599 1599
1600 try 1600 try
@@ -1660,7 +1660,7 @@ namespace OpenSim.Data.SQLite
1660 { 1660 {
1661 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName)) 1661 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName))
1662 { 1662 {
1663 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1663 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1664 return false; 1664 return false;
1665 } 1665 }
1666 } 1666 }
@@ -1669,7 +1669,7 @@ namespace OpenSim.Data.SQLite
1669 { 1669 {
1670 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName)) 1670 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName))
1671 { 1671 {
1672 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1672 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1673 return false; 1673 return false;
1674 } 1674 }
1675 } 1675 }
@@ -1680,7 +1680,7 @@ namespace OpenSim.Data.SQLite
1680 { 1680 {
1681 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName)) 1681 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName))
1682 { 1682 {
1683 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1683 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1684 return false; 1684 return false;
1685 } 1685 }
1686 } 1686 }
@@ -1689,7 +1689,7 @@ namespace OpenSim.Data.SQLite
1689 { 1689 {
1690 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName)) 1690 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName))
1691 { 1691 {
1692 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1692 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1693 return false; 1693 return false;
1694 } 1694 }
1695 } 1695 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 97797e0..ec90f34 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Data.SQLite
93 } 93 }
94 catch (SqliteSyntaxException) 94 catch (SqliteSyntaxException)
95 { 95 {
96 m_log.Info("[SQLITE]: userfriends table not found, creating.... "); 96 m_log.Info("[USER DB]: userfriends table not found, creating.... ");
97 InitDB(conn); 97 InitDB(conn);
98 daf.Fill(ds.Tables["userfriends"]); 98 daf.Fill(ds.Tables["userfriends"]);
99 } 99 }
@@ -221,7 +221,7 @@ namespace OpenSim.Data.SQLite
221 } 221 }
222 catch (Exception ex) 222 catch (Exception ex)
223 { 223 {
224 m_log.Error("[USER]: Exception getting friends list for user: " + ex.ToString()); 224 m_log.Error("[USER DB]: Exception getting friends list for user: " + ex.ToString());
225 } 225 }
226 } 226 }
227 227
@@ -235,7 +235,7 @@ namespace OpenSim.Data.SQLite
235 235
236 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) 236 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid)
237 { 237 {
238 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 238 m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
239 } 239 }
240 240
241 241
@@ -343,7 +343,7 @@ namespace OpenSim.Data.SQLite
343 DataRow row = users.Rows.Find(Util.ToRawUuidString(AgentID)); 343 DataRow row = users.Rows.Find(Util.ToRawUuidString(AgentID));
344 if (row == null) 344 if (row == null)
345 { 345 {
346 m_log.Warn("[WEBLOGIN]: Unable to store new web login key for non-existant user"); 346 m_log.Warn("[USER DB]: Unable to store new web login key for non-existant user");
347 } 347 }
348 else 348 else
349 { 349 {
@@ -415,7 +415,7 @@ namespace OpenSim.Data.SQLite
415 } 415 }
416 } 416 }
417 417
418 m_log.Info("[SQLITE]: " + 418 m_log.Info("[USER DB]: " +
419 "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored"); 419 "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
420 // save changes off to disk 420 // save changes off to disk
421 da.Update(ds, "users"); 421 da.Update(ds, "users");
@@ -769,7 +769,7 @@ namespace OpenSim.Data.SQLite
769 } 769 }
770 catch (Exception) 770 catch (Exception)
771 { 771 {
772 m_log.Info("[USERS]: users table already exists"); 772 m_log.Info("[USER DB]: users table already exists");
773 } 773 }
774 774
775 try 775 try
@@ -778,7 +778,7 @@ namespace OpenSim.Data.SQLite
778 } 778 }
779 catch (Exception) 779 catch (Exception)
780 { 780 {
781 m_log.Info("[USERS]: userfriends table already exists"); 781 m_log.Info("[USER DB]: userfriends table already exists");
782 } 782 }
783 783
784 conn.Close(); 784 conn.Close();
@@ -801,7 +801,7 @@ namespace OpenSim.Data.SQLite
801 } 801 }
802 catch (SqliteSyntaxException) 802 catch (SqliteSyntaxException)
803 { 803 {
804 m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); 804 m_log.Info("[USER DB]: SQLite Database doesn't exist... creating");
805 InitDB(conn); 805 InitDB(conn);
806 } 806 }
807 conn.Open(); 807 conn.Open();