aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2013-05-31 10:40:47 -0400
committerBlueWall2013-05-31 10:40:47 -0400
commitbf035233232885b798a56a1687319ba167e4bf60 (patch)
tree057eaa65a3c17be9adbb45a20d5f098fb2217971 /OpenSim
parentTrigger Jenkins build (diff)
downloadopensim-SC_OLD-bf035233232885b798a56a1687319ba167e4bf60.zip
opensim-SC_OLD-bf035233232885b798a56a1687319ba167e4bf60.tar.gz
opensim-SC_OLD-bf035233232885b798a56a1687319ba167e4bf60.tar.bz2
opensim-SC_OLD-bf035233232885b798a56a1687319ba167e4bf60.tar.xz
Fill in fields with default values on profile creation
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs50
1 files changed, 48 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 09bd448..5d7149b 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -622,7 +622,7 @@ namespace OpenSim.Data.MySQL
622 { 622 {
623 m_log.DebugFormat("[PROFILES_DATA]" + 623 m_log.DebugFormat("[PROFILES_DATA]" +
624 ": No data for {0}", props.UserId); 624 ": No data for {0}", props.UserId);
625 625
626 props.WebUrl = string.Empty; 626 props.WebUrl = string.Empty;
627 props.ImageId = UUID.Zero; 627 props.ImageId = UUID.Zero;
628 props.AboutText = string.Empty; 628 props.AboutText = string.Empty;
@@ -634,8 +634,38 @@ namespace OpenSim.Data.MySQL
634 props.SkillsMask = 0; 634 props.SkillsMask = 0;
635 props.SkillsText = string.Empty; 635 props.SkillsText = string.Empty;
636 props.Language = string.Empty; 636 props.Language = string.Empty;
637 props.PublishProfile = false;
638 props.PublishMature = false;
637 639
638 query = "INSERT INTO userprofile (`useruuid`) VALUES (?userId)"; 640 query = "INSERT INTO userprofile (";
641 query += "useruuid, ";
642 query += "profilePartner, ";
643 query += "profileAllowPublish, ";
644 query += "profileMaturePublish, ";
645 query += "profileURL, ";
646 query += "profileWantToMask, ";
647 query += "profileWantToText, ";
648 query += "profileSkillsMask, ";
649 query += "profileSkillsText, ";
650 query += "profileLanguages, ";
651 query += "profileImage, ";
652 query += "profileAboutText, ";
653 query += "profileFirstImage, ";
654 query += "profileFirstText) VALUES (";
655 query += "?userId, ";
656 query += "?profilePartner, ";
657 query += "?profileAllowPublish, ";
658 query += "?profileMaturePublish, ";
659 query += "?profileURL, ";
660 query += "?profileWantToMask, ";
661 query += "?profileWantToText, ";
662 query += "?profileSkillsMask, ";
663 query += "?profileSkillsText, ";
664 query += "?profileLanguages, ";
665 query += "?profileImage, ";
666 query += "?profileAboutText, ";
667 query += "?profileFirstImage, ";
668 query += "?profileFirstText)";
639 669
640 dbcon.Close(); 670 dbcon.Close();
641 dbcon.Open(); 671 dbcon.Open();
@@ -643,6 +673,20 @@ namespace OpenSim.Data.MySQL
643 using (MySqlCommand put = new MySqlCommand(query, dbcon)) 673 using (MySqlCommand put = new MySqlCommand(query, dbcon))
644 { 674 {
645 put.Parameters.AddWithValue("?userId", props.UserId.ToString()); 675 put.Parameters.AddWithValue("?userId", props.UserId.ToString());
676 put.Parameters.AddWithValue("?profilePartner", props.PartnerId.ToString());
677 put.Parameters.AddWithValue("?profileAllowPublish", props.PublishProfile);
678 put.Parameters.AddWithValue("?profileMaturePublish", props.PublishMature);
679 put.Parameters.AddWithValue("?profileURL", props.WebUrl);
680 put.Parameters.AddWithValue("?profileWantToMask", props.WantToMask);
681 put.Parameters.AddWithValue("?profileWantToText", props.WantToText);
682 put.Parameters.AddWithValue("?profileSkillsMask", props.SkillsMask);
683 put.Parameters.AddWithValue("?profileSkillsText", props.SkillsText);
684 put.Parameters.AddWithValue("?profileLanguages", props.Language);
685 put.Parameters.AddWithValue("?profileImage", props.ImageId.ToString());
686 put.Parameters.AddWithValue("?profileAboutText", props.AboutText);
687 put.Parameters.AddWithValue("?profileFirstImage", props.FirstLifeImageId.ToString());
688 put.Parameters.AddWithValue("?profileFirstText", props.FirstLifeText);
689
646 put.ExecuteNonQuery(); 690 put.ExecuteNonQuery();
647 } 691 }
648 } 692 }
@@ -665,6 +709,7 @@ namespace OpenSim.Data.MySQL
665 string query = string.Empty; 709 string query = string.Empty;
666 710
667 query += "UPDATE userprofile SET "; 711 query += "UPDATE userprofile SET ";
712 query += "profilePartner=?profilePartner, ";
668 query += "profileURL=?profileURL, "; 713 query += "profileURL=?profileURL, ";
669 query += "profileImage=?image, "; 714 query += "profileImage=?image, ";
670 query += "profileAboutText=?abouttext,"; 715 query += "profileAboutText=?abouttext,";
@@ -680,6 +725,7 @@ namespace OpenSim.Data.MySQL
680 using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) 725 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
681 { 726 {
682 cmd.Parameters.AddWithValue("?profileURL", props.WebUrl); 727 cmd.Parameters.AddWithValue("?profileURL", props.WebUrl);
728 cmd.Parameters.AddWithValue("?profilePartner", props.PartnerId.ToString());
683 cmd.Parameters.AddWithValue("?image", props.ImageId.ToString()); 729 cmd.Parameters.AddWithValue("?image", props.ImageId.ToString());
684 cmd.Parameters.AddWithValue("?abouttext", props.AboutText); 730 cmd.Parameters.AddWithValue("?abouttext", props.AboutText);
685 cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString()); 731 cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString());