aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorMelanie Thielker2010-09-05 14:16:42 +0200
committerMelanie2010-09-05 14:28:33 +0100
commit6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch)
tree19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Data/SQLite
parentLogout the presence if client IP verification fails. (diff)
downloadopensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.zip
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.gz
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.bz2
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.xz
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs3
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs3
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 8432e74..88699a7 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1111,7 +1111,6 @@ namespace OpenSim.Data.SQLite
1111 createCol(land, "UserLookAtZ", typeof (Double)); 1111 createCol(land, "UserLookAtZ", typeof (Double));
1112 createCol(land, "AuthbuyerID", typeof(String)); 1112 createCol(land, "AuthbuyerID", typeof(String));
1113 createCol(land, "OtherCleanTime", typeof(Int32)); 1113 createCol(land, "OtherCleanTime", typeof(Int32));
1114 createCol(land, "Dwell", typeof(Int32));
1115 1114
1116 land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; 1115 land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]};
1117 1116
@@ -1449,7 +1448,6 @@ namespace OpenSim.Data.SQLite
1449 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); 1448 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
1450 1449
1451 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); 1450 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
1452 newData.Dwell = Convert.ToInt32(row["Dwell"]);
1453 1451
1454 return newData; 1452 return newData;
1455 } 1453 }
@@ -1761,7 +1759,6 @@ namespace OpenSim.Data.SQLite
1761 row["UserLookAtZ"] = land.UserLookAt.Z; 1759 row["UserLookAtZ"] = land.UserLookAt.Z;
1762 row["AuthbuyerID"] = land.AuthBuyerID.ToString(); 1760 row["AuthbuyerID"] = land.AuthBuyerID.ToString();
1763 row["OtherCleanTime"] = land.OtherCleanTime; 1761 row["OtherCleanTime"] = land.OtherCleanTime;
1764 row["Dwell"] = land.Dwell;
1765 row["MediaType"] = land.MediaType; 1762 row["MediaType"] = land.MediaType;
1766 row["MediaDescription"] = land.MediaDescription; 1763 row["MediaDescription"] = land.MediaDescription;
1767 row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); 1764 row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString();
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
index 289fd94..b5ce4c0 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
@@ -1069,7 +1069,6 @@ namespace OpenSim.Data.SQLiteLegacy
1069 createCol(land, "UserLookAtZ", typeof (Double)); 1069 createCol(land, "UserLookAtZ", typeof (Double));
1070 createCol(land, "AuthbuyerID", typeof(String)); 1070 createCol(land, "AuthbuyerID", typeof(String));
1071 createCol(land, "OtherCleanTime", typeof(Int32)); 1071 createCol(land, "OtherCleanTime", typeof(Int32));
1072 createCol(land, "Dwell", typeof(Int32));
1073 1072
1074 land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; 1073 land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]};
1075 1074
@@ -1400,7 +1399,6 @@ namespace OpenSim.Data.SQLiteLegacy
1400 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); 1399 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
1401 1400
1402 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); 1401 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
1403 newData.Dwell = Convert.ToInt32(row["Dwell"]);
1404 1402
1405 return newData; 1403 return newData;
1406 } 1404 }
@@ -1711,7 +1709,6 @@ namespace OpenSim.Data.SQLiteLegacy
1711 row["UserLookAtZ"] = land.UserLookAt.Z; 1709 row["UserLookAtZ"] = land.UserLookAt.Z;
1712 row["AuthbuyerID"] = land.AuthBuyerID.ToString(); 1710 row["AuthbuyerID"] = land.AuthBuyerID.ToString();
1713 row["OtherCleanTime"] = land.OtherCleanTime; 1711 row["OtherCleanTime"] = land.OtherCleanTime;
1714 row["Dwell"] = land.Dwell;
1715 } 1712 }
1716 1713
1717 /// <summary> 1714 /// <summary>