aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-18 00:02:55 +0000
committerJustin Clark-Casey (justincc)2014-03-18 00:02:55 +0000
commit01520bbb3e3a1700e10ccb080ba4875e40e202ff (patch)
treec78bd7bfe3c190e9bc8837a8928a9e8f6ff86b2f /OpenSim/Data/MySQL/MySQLSimulationData.cs
parentAdd regression test for http inventory fetch. (diff)
downloadopensim-SC-01520bbb3e3a1700e10ccb080ba4875e40e202ff.zip
opensim-SC-01520bbb3e3a1700e10ccb080ba4875e40e202ff.tar.gz
opensim-SC-01520bbb3e3a1700e10ccb080ba4875e40e202ff.tar.bz2
opensim-SC-01520bbb3e3a1700e10ccb080ba4875e40e202ff.tar.xz
Save and load dwell parcel stat in MySQL DB adaptor. Field in table already exists!
The SQLite database adaptor was loading and saving dwell whilst MySQL was not, even though the field already exists in the db table.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 2921c1c..c5645a7 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -695,7 +695,7 @@ namespace OpenSim.Data.MySQL
695 "MusicURL, PassHours, PassPrice, SnapshotUUID, " + 695 "MusicURL, PassHours, PassPrice, SnapshotUUID, " +
696 "UserLocationX, UserLocationY, UserLocationZ, " + 696 "UserLocationX, UserLocationY, UserLocationZ, " +
697 "UserLookAtX, UserLookAtY, UserLookAtZ, " + 697 "UserLookAtX, UserLookAtY, UserLookAtZ, " +
698 "AuthbuyerID, OtherCleanTime, MediaType, MediaDescription, " + 698 "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " +
699 "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" + 699 "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" +
700 "?UUID, ?RegionUUID, " + 700 "?UUID, ?RegionUUID, " +
701 "?LocalLandID, ?Bitmap, ?Name, ?Description, " + 701 "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
@@ -706,7 +706,7 @@ namespace OpenSim.Data.MySQL
706 "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " + 706 "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " +
707 "?UserLocationX, ?UserLocationY, ?UserLocationZ, " + 707 "?UserLocationX, ?UserLocationY, ?UserLocationZ, " +
708 "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + 708 "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
709 "?AuthbuyerID, ?OtherCleanTime, ?MediaType, ?MediaDescription, "+ 709 "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+
710 "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)"; 710 "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)";
711 711
712 FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); 712 FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
@@ -1484,6 +1484,7 @@ namespace OpenSim.Data.MySQL
1484 UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); 1484 UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer);
1485 UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); 1485 UUID.TryParse((string)row["SnapshotUUID"], out snapshotID);
1486 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); 1486 newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
1487 newData.Dwell = Convert.ToSingle(row["Dwell"]);
1487 1488
1488 newData.AuthBuyerID = authedbuyer; 1489 newData.AuthBuyerID = authedbuyer;
1489 newData.SnapshotID = snapshotID; 1490 newData.SnapshotID = snapshotID;
@@ -1815,6 +1816,7 @@ namespace OpenSim.Data.MySQL
1815 cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z); 1816 cmd.Parameters.AddWithValue("UserLookAtZ", land.UserLookAt.Z);
1816 cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID); 1817 cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID);
1817 cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime); 1818 cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime);
1819 cmd.Parameters.AddWithValue("Dwell", land.OtherCleanTime);
1818 cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription); 1820 cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription);
1819 cmd.Parameters.AddWithValue("MediaType", land.MediaType); 1821 cmd.Parameters.AddWithValue("MediaType", land.MediaType);
1820 cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth); 1822 cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth);
@@ -1822,7 +1824,6 @@ namespace OpenSim.Data.MySQL
1822 cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop); 1824 cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop);
1823 cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic); 1825 cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic);
1824 cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia); 1826 cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia);
1825
1826 } 1827 }
1827 1828
1828 /// <summary> 1829 /// <summary>