aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-19 18:34:46 +0000
committerMelanie Thielker2008-08-19 18:34:46 +0000
commit41440e184b1c12f1b83d894b2cd5b7b801b4ca38 (patch)
tree1d3298ae47cc11f0167257a7aab7a45212b7a497 /OpenSim/Data
parentMoves one file to it's proper location (diff)
downloadopensim-SC_OLD-41440e184b1c12f1b83d894b2cd5b7b801b4ca38.zip
opensim-SC_OLD-41440e184b1c12f1b83d894b2cd5b7b801b4ca38.tar.gz
opensim-SC_OLD-41440e184b1c12f1b83d894b2cd5b7b801b4ca38.tar.bz2
opensim-SC_OLD-41440e184b1c12f1b83d894b2cd5b7b801b4ca38.tar.xz
Attachment persistence (Mantis #1711)
Change user server to handle attachment assets record properly. Ensure that attachments are not re-rezzed on region crossing. Persistence will NOT WORK with earliser UGAI!! Change region server to match.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs35
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs39
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs13
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs37
-rw-r--r--OpenSim/Data/UserDataBase.cs4
5 files changed, 19 insertions, 109 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index e63a9fe..cfe5f50 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -893,37 +893,6 @@ namespace OpenSim.Data.MSSQL
893 } 893 }
894 894
895 /// <summary> 895 /// <summary>
896 /// add an attachement to an avatar
897 /// </summary>
898 /// <param name="user">the avatar UUID</param>
899 /// <param name="item">the item UUID</param>
900 override public void AddAttachment(LLUUID user, LLUUID item)
901 {
902 // TBI?
903 }
904
905 /// <summary>
906 /// Remove an attachement from an avatar
907 /// </summary>
908 /// <param name="user">the avatar UUID</param>
909 /// <param name="item">the item UUID</param>
910 override public void RemoveAttachment(LLUUID user, LLUUID item)
911 {
912 // TBI?
913 }
914
915 /// <summary>
916 /// get (fetch?) all attached item to an avatar
917 /// </summary>
918 /// <param name="user">the avatar UUID</param>
919 /// <returns>List of attached item</returns>
920 /// <remarks>return an empty list</remarks>
921 override public List<LLUUID> GetAttachments(LLUUID user)
922 {
923 return new List<LLUUID>();
924 }
925
926 /// <summary>
927 /// Database provider name 896 /// Database provider name
928 /// </summary> 897 /// </summary>
929 /// <returns>Provider name</returns> 898 /// <returns>Provider name</returns>
@@ -948,5 +917,9 @@ namespace OpenSim.Data.MSSQL
948 public void runQuery(string query) 917 public void runQuery(string query)
949 { 918 {
950 } 919 }
920
921 override public void ResetAttachments(LLUUID userID)
922 {
923 }
951 } 924 }
952} 925}
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 9a056b2..caae677 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -779,36 +779,6 @@ namespace OpenSim.Data.MySQL
779 } 779 }
780 780
781 /// <summary> 781 /// <summary>
782 /// Adds an attachment item to a user
783 /// </summary>
784 /// <param name="user">the user UUID</param>
785 /// <param name="item">the item UUID</param>
786 override public void AddAttachment(LLUUID user, LLUUID item)
787 {
788 return;
789 }
790
791 /// <summary>
792 /// Removes an attachment from a user
793 /// </summary>
794 /// <param name="user">the user UUID</param>
795 /// <param name="item">the item UUID</param>
796 override public void RemoveAttachment(LLUUID user, LLUUID item)
797 {
798 return;
799 }
800
801 /// <summary>
802 /// Get the list of item attached to a user
803 /// </summary>
804 /// <param name="user">the user UUID</param>
805 /// <returns>UUID list of attached item</returns>
806 override public List<LLUUID> GetAttachments(LLUUID user)
807 {
808 return new List<LLUUID>();
809 }
810
811 /// <summary>
812 /// Database provider name 782 /// Database provider name
813 /// </summary> 783 /// </summary>
814 /// <returns>Provider name</returns> 784 /// <returns>Provider name</returns>
@@ -845,5 +815,14 @@ namespace OpenSim.Data.MySQL
845 { 815 {
846 database.writeAttachments(agentID, data); 816 database.writeAttachments(agentID, data);
847 } 817 }
818
819 override public void ResetAttachments(LLUUID userID)
820 {
821 MySqlCommand cmd = (MySqlCommand) (database.Connection.CreateCommand());
822 cmd.CommandText = "update avatarattachments set asset = '00000000-0000-0000-0000-000000000000' where UUID = ?uuid";
823 cmd.Parameters.AddWithValue("?uuid", userID.ToString());
824
825 cmd.ExecuteNonQuery();
826 }
848 } 827 }
849} 828}
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index c776474..8435762 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -303,19 +303,8 @@ namespace OpenSim.Data.NHibernate
303 } 303 }
304 } 304 }
305 305
306 override public void AddAttachment(LLUUID user, LLUUID item) 306 public override void ResetAttachments(LLUUID userID)
307 { 307 {
308 return;
309 }
310
311 override public void RemoveAttachment(LLUUID user, LLUUID item)
312 {
313 return;
314 }
315
316 override public List<LLUUID> GetAttachments(LLUUID user)
317 {
318 return new List<LLUUID>();
319 } 308 }
320 309
321 public override string Name { 310 public override string Name {
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 08a97f09..beff2a4 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -583,39 +583,6 @@ namespace OpenSim.Data.SQLite
583 } 583 }
584 584
585 /// <summary> 585 /// <summary>
586 /// Add an attachment item to an avatar
587 /// </summary>
588 /// <param name="user">the user UUID</param>
589 /// <param name="item">the item UUID</param>
590 /// <remarks>DO NOTHING ?</remarks>
591 override public void AddAttachment(LLUUID user, LLUUID item)
592 {
593 return;
594 }
595
596 /// <summary>
597 /// Remove an attachement item from an avatar
598 /// </summary>
599 /// <param name="user">the user UUID</param>
600 /// <param name="item">the item UUID</param>
601 /// <remarks>DO NOTHING ?</remarks>
602 override public void RemoveAttachment(LLUUID user, LLUUID item)
603 {
604 return;
605 }
606
607 /// <summary>
608 /// Get list of attached item
609 /// </summary>
610 /// <param name="user">the user UUID</param>
611 /// <returns>List of attached item</returns>
612 /// <remarks>DO NOTHING ?</remarks>
613 override public List<LLUUID> GetAttachments(LLUUID user)
614 {
615 return new List<LLUUID>();
616 }
617
618 /// <summary>
619 /// Returns the name of the storage provider 586 /// Returns the name of the storage provider
620 /// </summary> 587 /// </summary>
621 /// <returns>Storage provider name</returns> 588 /// <returns>Storage provider name</returns>
@@ -1040,5 +1007,9 @@ namespace OpenSim.Data.SQLite
1040 1007
1041 // return true; 1008 // return true;
1042 } 1009 }
1010
1011 override public void ResetAttachments(LLUUID userID)
1012 {
1013 }
1043 } 1014 }
1044} 1015}
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index b984c10..e57c8f8 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -72,9 +72,7 @@ namespace OpenSim.Data
72 // aplist[user] = appearance; 72 // aplist[user] = appearance;
73 // m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); 73 // m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
74 // } 74 // }
75 public abstract void AddAttachment(LLUUID user, LLUUID item); 75 public abstract void ResetAttachments(LLUUID userID);
76 public abstract void RemoveAttachment(LLUUID user, LLUUID item);
77 public abstract List<LLUUID> GetAttachments(LLUUID user);
78 76
79 public abstract string Version {get;} 77 public abstract string Version {get;}
80 public abstract string Name {get;} 78 public abstract string Name {get;}