diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index c47a85d026..c461bf0727 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -1,4 +1,4 @@
-:VERSION 1
+:VERSION 1
BEGIN TRANSACTION;
@@ -219,59 +219,6 @@ COMMIT;
BEGIN TRANSACTION;
-CREATE TABLE estate_groups (
- EstateID int(10) NOT NULL,
- uuid char(36) NOT NULL
-);
-
-CREATE TABLE estate_managers (
- EstateID int(10) NOT NULL,
- uuid char(36) NOT NULL
-);
-
-CREATE TABLE estate_map (
- RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
- EstateID int(11) NOT NULL
-);
-
-CREATE TABLE estate_settings (
- EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- EstateName varchar(64) default NULL,
- AbuseEmailToEstateOwner tinyint(4) NOT NULL,
- DenyAnonymous tinyint(4) NOT NULL,
- ResetHomeOnTeleport tinyint(4) NOT NULL,
- FixedSun tinyint(4) NOT NULL,
- DenyTransacted tinyint(4) NOT NULL,
- BlockDwell tinyint(4) NOT NULL,
- DenyIdentified tinyint(4) NOT NULL,
- AllowVoice tinyint(4) NOT NULL,
- UseGlobalTime tinyint(4) NOT NULL,
- PricePerMeter int(11) NOT NULL,
- TaxFree tinyint(4) NOT NULL,
- AllowDirectTeleport tinyint(4) NOT NULL,
- RedirectGridX int(11) NOT NULL,
- RedirectGridY int(11) NOT NULL,
- ParentEstateID int(10) NOT NULL,
- SunPosition double NOT NULL,
- EstateSkipScripts tinyint(4) NOT NULL,
- BillableFactor float NOT NULL,
- PublicAccess tinyint(4) NOT NULL
-);
-insert into estate_settings (EstateID,EstateName,AbuseEmailToEstateOwner,DenyAnonymous,ResetHomeOnTeleport,FixedSun,DenyTransacted,BlockDwell,DenyIdentified,AllowVoice,UseGlobalTime,PricePerMeter,TaxFree,AllowDirectTeleport,RedirectGridX,RedirectGridY,ParentEstateID,SunPosition,PublicAccess,EstateSkipScripts,BillableFactor) values ( 99, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-delete from estate_settings;
-CREATE TABLE estate_users (
- EstateID int(10) NOT NULL,
- uuid char(36) NOT NULL
-);
-
-CREATE TABLE estateban (
- EstateID int(10) NOT NULL,
- bannedUUID varchar(36) NOT NULL,
- bannedIp varchar(16) NOT NULL,
- bannedIpHostMask varchar(16) NOT NULL,
- bannedNameMask varchar(64) default NULL
-);
-
drop table regionsettings;
CREATE TABLE regionsettings (
regionUUID char(36) NOT NULL,
@@ -307,7 +254,7 @@ CREATE TABLE regionsettings (
fixed_sun int(11) NOT NULL,
sun_position float NOT NULL,
covenant char(36) default NULL,
- Sandbox tinyint(4) NOT NULL,
+ sandbox tinyint(4) NOT NULL,
PRIMARY KEY (regionUUID)
);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 85703dc2ca..81d0ac4f6e 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Data.SQLite
ds = new DataSet("Region");
- m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
+ m_log.Info("[SQLITE REGION DB]: Sqlite - connecting: " + connectionString);
m_conn = new SqliteConnection(m_connectionString);
m_conn.Open();
@@ -156,7 +156,7 @@ namespace OpenSim.Data.SQLite
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on prims table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on prims table");
}
try
@@ -165,16 +165,25 @@ namespace OpenSim.Data.SQLite
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on primshapes table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on primshapes table");
}
+ try
+ {
+ itemsDa.Fill(ds.Tables["primitems"]);
+ }
+ catch (Exception)
+ {
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on primitems table");
+ }
+
try
{
terrainDa.Fill(ds.Tables["terrain"]);
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on terrain table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on terrain table");
}
try
@@ -183,7 +192,7 @@ namespace OpenSim.Data.SQLite
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on land table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on land table");
}
try
@@ -192,7 +201,7 @@ namespace OpenSim.Data.SQLite
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on landaccesslist table");
}
try
@@ -201,7 +210,7 @@ namespace OpenSim.Data.SQLite
}
catch (Exception)
{
- m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
+ m_log.Info("[SQLITE REGION DB]: Caught fill error on regionsettings table");
}
// We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
@@ -434,7 +443,7 @@ namespace OpenSim.Data.SQLite
lock (ds)
{
DataRow[] primsForRegion = prims.Select(byRegion);
- m_log.Info("[REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
+// m_log.Info("[SQLITE REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
// First, create all groups
foreach (DataRow primRow in primsForRegion)
@@ -456,8 +465,8 @@ namespace OpenSim.Data.SQLite
}
else
{
- m_log.Info(
- "[REGION DB]: No shape found for prim in storage, so setting default box shape");
+ m_log.Warn(
+ "[SQLITE REGION DB]: No shape found for prim in storage, so setting default box shape");
prim.Shape = PrimitiveBaseShape.Default;
}
@@ -469,11 +478,11 @@ namespace OpenSim.Data.SQLite
}
catch (Exception e)
{
- m_log.Error("[REGION DB]: Failed create prim object in new group, exception and data follows");
- m_log.Info("[REGION DB]: " + e.ToString());
+ m_log.Error("[SQLITE REGION DB]: Failed create prim object in new group, exception and data follows");
+ m_log.Error("[SQLITE REGION DB]: ", e);
foreach (DataColumn col in prims.Columns)
{
- m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
+ m_log.Error("[SQLITE REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
}
}
}
@@ -498,7 +507,7 @@ namespace OpenSim.Data.SQLite
else
{
m_log.Warn(
- "[REGION DB]: No shape found for prim in storage, so setting default box shape");
+ "[SQLITE REGION DB]: No shape found for prim in storage, so setting default box shape");
prim.Shape = PrimitiveBaseShape.Default;
}
@@ -508,11 +517,11 @@ namespace OpenSim.Data.SQLite
}
catch (Exception e)
{
- m_log.Error("[REGION DB]: Failed create prim object in group, exception and data follows");
- m_log.Info("[REGION DB]: " + e.ToString());
+ m_log.Error("[SQLITE REGION DB]: Failed create prim object in group, exception and data follows");
+ m_log.Error("[SQLITE REGION DB]: ", e);
foreach (DataColumn col in prims.Columns)
{
- m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
+ m_log.Error("[SQLITE REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
}
}
}
@@ -525,20 +534,23 @@ namespace OpenSim.Data.SQLite
///
/// the prim
private void LoadItems(SceneObjectPart prim)
- {
- //m_log.DebugFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID);
-
+ {
+// m_log.DebugFormat("[SQLITE REGION DB]: Loading inventory for {0} {1}", prim.Name, prim.UUID);
+
DataTable dbItems = ds.Tables["primitems"];
- String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
+ String sql = String.Format("primID = '{0}'", prim.UUID.ToString());
DataRow[] dbItemRows = dbItems.Select(sql);
IList inventory = new List();
+// m_log.DebugFormat(
+// "[SQLITE REGION DB]: Found {0} items for {1} {2}", dbItemRows.Length, prim.Name, prim.UUID);
+
foreach (DataRow row in dbItemRows)
{
TaskInventoryItem item = buildItem(row);
inventory.Add(item);
- //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID);
+// m_log.DebugFormat("[SQLITE REGION DB]: Restored item {0} {1}", item.Name, item.ItemID);
}
prim.Inventory.RestoreInventoryItems(inventory);
@@ -574,7 +586,7 @@ namespace OpenSim.Data.SQLite
// the following is an work around for .NET. The perf
// issues associated with it aren't as bad as you think.
- m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
+ m_log.Debug("[SQLITE REGION DB]: Storing terrain revision r" + revision.ToString());
String sql = "insert into terrain(RegionUUID, Revision, Heightfield)" +
" values(:RegionUUID, :Revision, :Heightfield)";
@@ -630,11 +642,11 @@ namespace OpenSim.Data.SQLite
}
else
{
- m_log.Info("[REGION DB]: No terrain found for region");
+ m_log.Warn("[SQLITE REGION DB]: No terrain found for region");
return null;
}
- m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
+ m_log.Debug("[SQLITE REGION DB]: Loaded terrain revision r" + rev.ToString());
}
}
return terret;
@@ -1417,7 +1429,7 @@ namespace OpenSim.Data.SQLite
}
catch (InvalidCastException)
{
- m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
+ m_log.ErrorFormat("[SQLITE REGION DB]: unable to get parcel telehub settings for {1}", newData.Name);
newData.UserLocation = Vector3.Zero;
newData.UserLookAt = Vector3.Zero;
}
@@ -1926,7 +1938,7 @@ namespace OpenSim.Data.SQLite
///
public void StorePrimInventory(UUID primID, ICollection items)
{
- //m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
+// m_log.DebugFormat("[SQLITE REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
DataTable dbItems = ds.Tables["primitems"];
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 5e68ab0ac1..7b55467734 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -21,4 +21,4 @@
[TestConnections]
MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection=""
\ No newline at end of file
+SqliteConnection="URI=file:opensim-nunit.db,version=3"
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index ee17fbf8ed..f8591ba8ad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Framework.Scenes
}
catch (Exception e)
{
- m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e.ToString());
+ m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
}
}
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void RegisterModuleInterface(M mod)
{
- m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
+// m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
List