aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorRobert Adams2013-12-05 21:07:44 -0800
committerRobert Adams2013-12-05 21:07:44 -0800
commit4eb52eb19e2bd18ad5dc56a06600fa966f3190a3 (patch)
tree4c6428c00023c4668ef516d1e44ee576fabb3721 /OpenSim/Data/MySQL
parentMerge branch 'master' into varregion (diff)
parentAdding profile partners fix to SQLite and PgSQL drivers (diff)
downloadopensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.zip
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.gz
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.bz2
opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 4c6c8e3..dc88f94 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -736,7 +736,6 @@ namespace OpenSim.Data.MySQL
736 string query = string.Empty; 736 string query = string.Empty;
737 737
738 query += "UPDATE userprofile SET "; 738 query += "UPDATE userprofile SET ";
739 query += "profilePartner=?profilePartner, ";
740 query += "profileURL=?profileURL, "; 739 query += "profileURL=?profileURL, ";
741 query += "profileImage=?image, "; 740 query += "profileImage=?image, ";
742 query += "profileAboutText=?abouttext,"; 741 query += "profileAboutText=?abouttext,";
@@ -752,7 +751,6 @@ namespace OpenSim.Data.MySQL
752 using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) 751 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
753 { 752 {
754 cmd.Parameters.AddWithValue("?profileURL", props.WebUrl); 753 cmd.Parameters.AddWithValue("?profileURL", props.WebUrl);
755 cmd.Parameters.AddWithValue("?profilePartner", props.PartnerId.ToString());
756 cmd.Parameters.AddWithValue("?image", props.ImageId.ToString()); 754 cmd.Parameters.AddWithValue("?image", props.ImageId.ToString());
757 cmd.Parameters.AddWithValue("?abouttext", props.AboutText); 755 cmd.Parameters.AddWithValue("?abouttext", props.AboutText);
758 cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString()); 756 cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString());