aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteUserData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteUserData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs90
1 files changed, 45 insertions, 45 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index ae3cb72..7f1fd62 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname"; 59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname"; 60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
61 61
62 private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>(); 62 private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
63 private DataSet ds; 63 private DataSet ds;
64 private SqliteDataAdapter da; 64 private SqliteDataAdapter da;
65 private SqliteDataAdapter daf; 65 private SqliteDataAdapter daf;
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124 /// </summary> 124 /// </summary>
125 /// <param name="uuid">User UUID</param> 125 /// <param name="uuid">User UUID</param>
126 /// <returns>user profile data</returns> 126 /// <returns>user profile data</returns>
127 override public UserProfileData GetUserByUUID(LLUUID uuid) 127 override public UserProfileData GetUserByUUID(UUID uuid)
128 { 128 {
129 lock (ds) 129 lock (ds)
130 { 130 {
@@ -184,21 +184,21 @@ namespace OpenSim.Data.SQLite
184 /// <param name="friendlistowner">UUID of the friendlist owner</param> 184 /// <param name="friendlistowner">UUID of the friendlist owner</param>
185 /// <param name="friend">UUID of the friend to add</param> 185 /// <param name="friend">UUID of the friend to add</param>
186 /// <param name="perms">permission flag</param> 186 /// <param name="perms">permission flag</param>
187 override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 187 override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
188 { 188 {
189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)"; 189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
190 190
191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
192 { 192 {
193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
195 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 195 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
196 cmd.ExecuteNonQuery(); 196 cmd.ExecuteNonQuery();
197 } 197 }
198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
199 { 199 {
200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.UUID.ToString())); 200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.ToString()));
201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.UUID.ToString())); 201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.ToString()));
202 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 202 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
203 cmd.ExecuteNonQuery(); 203 cmd.ExecuteNonQuery();
204 } 204 }
@@ -209,13 +209,13 @@ namespace OpenSim.Data.SQLite
209 /// </summary> 209 /// </summary>
210 /// <param name="friendlistowner">UUID of the friendlist owner</param> 210 /// <param name="friendlistowner">UUID of the friendlist owner</param>
211 /// <param name="friend">UUID of the friend to remove</param> 211 /// <param name="friend">UUID of the friend to remove</param>
212 override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 212 override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
213 { 213 {
214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)"; 214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn)) 215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
216 { 216 {
217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
219 cmd.ExecuteNonQuery(); 219 cmd.ExecuteNonQuery();
220 } 220 }
221 } 221 }
@@ -226,14 +226,14 @@ namespace OpenSim.Data.SQLite
226 /// <param name="friendlistowner">UUID of the friendlist owner</param> 226 /// <param name="friendlistowner">UUID of the friendlist owner</param>
227 /// <param name="friend">UUID of the friend to modify</param> 227 /// <param name="friend">UUID of the friend to modify</param>
228 /// <param name="perms">updated permission flag</param> 228 /// <param name="perms">updated permission flag</param>
229 override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 229 override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
230 { 230 {
231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID"; 231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID";
232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn)) 232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
233 { 233 {
234 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 234 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
237 cmd.ExecuteNonQuery(); 237 cmd.ExecuteNonQuery();
238 } 238 }
239 } 239 }
@@ -243,13 +243,13 @@ namespace OpenSim.Data.SQLite
243 /// </summary> 243 /// </summary>
244 /// <param name="friendlistowner">UUID of the friendlist owner</param> 244 /// <param name="friendlistowner">UUID of the friendlist owner</param>
245 /// <returns>The friendlist list</returns> 245 /// <returns>The friendlist list</returns>
246 override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 246 override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
247 { 247 {
248 List<FriendListItem> returnlist = new List<FriendListItem>(); 248 List<FriendListItem> returnlist = new List<FriendListItem>();
249 249
250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn)) 250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn))
251 { 251 {
252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
253 253
254 try 254 try
255 { 255 {
@@ -259,7 +259,7 @@ namespace OpenSim.Data.SQLite
259 { 259 {
260 FriendListItem user = new FriendListItem(); 260 FriendListItem user = new FriendListItem();
261 user.FriendListOwner = friendlistowner; 261 user.FriendListOwner = friendlistowner;
262 user.Friend = new LLUUID((string)reader[0]); 262 user.Friend = new UUID((string)reader[0]);
263 user.FriendPerms = Convert.ToUInt32(reader[1]); 263 user.FriendPerms = Convert.ToUInt32(reader[1]);
264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]); 264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]);
265 returnlist.Add(user); 265 returnlist.Add(user);
@@ -288,7 +288,7 @@ namespace OpenSim.Data.SQLite
288 /// <param name="regionuuid">UUID of the region</param> 288 /// <param name="regionuuid">UUID of the region</param>
289 /// <param name="regionhandle">region handle</param> 289 /// <param name="regionhandle">region handle</param>
290 /// <remarks>DO NOTHING</remarks> 290 /// <remarks>DO NOTHING</remarks>
291 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 291 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
292 { 292 {
293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
294 } 294 }
@@ -299,7 +299,7 @@ namespace OpenSim.Data.SQLite
299 /// <param name="queryID"></param> 299 /// <param name="queryID"></param>
300 /// <param name="query"></param> 300 /// <param name="query"></param>
301 /// <returns></returns> 301 /// <returns></returns>
302 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 302 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
303 { 303 {
304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
305 string[] querysplit; 305 string[] querysplit;
@@ -316,7 +316,7 @@ namespace OpenSim.Data.SQLite
316 while (reader.Read()) 316 while (reader.Read())
317 { 317 {
318 AvatarPickerAvatar user = new AvatarPickerAvatar(); 318 AvatarPickerAvatar user = new AvatarPickerAvatar();
319 user.AvatarID = new LLUUID((string) reader["UUID"]); 319 user.AvatarID = new UUID((string) reader["UUID"]);
320 user.firstName = (string) reader["username"]; 320 user.firstName = (string) reader["username"];
321 user.lastName = (string) reader["surname"]; 321 user.lastName = (string) reader["surname"];
322 returnlist.Add(user); 322 returnlist.Add(user);
@@ -337,7 +337,7 @@ namespace OpenSim.Data.SQLite
337 while (reader.Read()) 337 while (reader.Read())
338 { 338 {
339 AvatarPickerAvatar user = new AvatarPickerAvatar(); 339 AvatarPickerAvatar user = new AvatarPickerAvatar();
340 user.AvatarID = new LLUUID((string) reader["UUID"]); 340 user.AvatarID = new UUID((string) reader["UUID"]);
341 user.firstName = (string) reader["username"]; 341 user.firstName = (string) reader["username"];
342 user.lastName = (string) reader["surname"]; 342 user.lastName = (string) reader["surname"];
343 returnlist.Add(user); 343 returnlist.Add(user);
@@ -354,7 +354,7 @@ namespace OpenSim.Data.SQLite
354 /// </summary> 354 /// </summary>
355 /// <param name="uuid">The user's account ID</param> 355 /// <param name="uuid">The user's account ID</param>
356 /// <returns>A matching user profile</returns> 356 /// <returns>A matching user profile</returns>
357 override public UserAgentData GetAgentByUUID(LLUUID uuid) 357 override public UserAgentData GetAgentByUUID(UUID uuid)
358 { 358 {
359 try 359 try
360 { 360 {
@@ -399,7 +399,7 @@ namespace OpenSim.Data.SQLite
399 /// </summary> 399 /// </summary>
400 /// <param name="AgentID">UUID of the user</param> 400 /// <param name="AgentID">UUID of the user</param>
401 /// <param name="WebLoginKey">UUID of the weblogin</param> 401 /// <param name="WebLoginKey">UUID of the weblogin</param>
402 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 402 override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
403 { 403 {
404 DataTable users = ds.Tables["users"]; 404 DataTable users = ds.Tables["users"];
405 lock (ds) 405 lock (ds)
@@ -520,7 +520,7 @@ namespace OpenSim.Data.SQLite
520 /// <param name="to">End account</param> 520 /// <param name="to">End account</param>
521 /// <param name="amount">The amount to move</param> 521 /// <param name="amount">The amount to move</param>
522 /// <returns>Success?</returns> 522 /// <returns>Success?</returns>
523 override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 523 override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
524 { 524 {
525 return true; 525 return true;
526 } 526 }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
533 /// <param name="to">Receivers account</param> 533 /// <param name="to">Receivers account</param>
534 /// <param name="item">Inventory item</param> 534 /// <param name="item">Inventory item</param>
535 /// <returns>Success?</returns> 535 /// <returns>Success?</returns>
536 override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 536 override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
537 { 537 {
538 return true; 538 return true;
539 } 539 }
@@ -545,7 +545,7 @@ namespace OpenSim.Data.SQLite
545 /// </summary> 545 /// </summary>
546 /// <param name="user">The user UUID</param> 546 /// <param name="user">The user UUID</param>
547 /// <returns>Avatar Appearence</returns> 547 /// <returns>Avatar Appearence</returns>
548 override public AvatarAppearance GetUserAppearance(LLUUID user) 548 override public AvatarAppearance GetUserAppearance(UUID user)
549 { 549 {
550 AvatarAppearance aa = null; 550 AvatarAppearance aa = null;
551 try { 551 try {
@@ -562,7 +562,7 @@ namespace OpenSim.Data.SQLite
562 /// </summary> 562 /// </summary>
563 /// <param name="user">the user UUID</param> 563 /// <param name="user">the user UUID</param>
564 /// <param name="appearance">appearence</param> 564 /// <param name="appearance">appearence</param>
565 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 565 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
566 { 566 {
567 appearance.Owner = user; 567 appearance.Owner = user;
568 aplist[user] = appearance; 568 aplist[user] = appearance;
@@ -707,8 +707,8 @@ namespace OpenSim.Data.SQLite
707 private static UserProfileData buildUserProfile(DataRow row) 707 private static UserProfileData buildUserProfile(DataRow row)
708 { 708 {
709 UserProfileData user = new UserProfileData(); 709 UserProfileData user = new UserProfileData();
710 LLUUID tmp; 710 UUID tmp;
711 LLUUID.TryParse((String)row["UUID"], out tmp); 711 UUID.TryParse((String)row["UUID"], out tmp);
712 user.ID = tmp; 712 user.ID = tmp;
713 user.FirstName = (String) row["username"]; 713 user.FirstName = (String) row["username"];
714 user.SurName = (String) row["surname"]; 714 user.SurName = (String) row["surname"];
@@ -717,39 +717,39 @@ namespace OpenSim.Data.SQLite
717 717
718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]); 718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]);
719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]); 719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]);
720 user.HomeLocation = new LLVector3( 720 user.HomeLocation = new Vector3(
721 Convert.ToSingle(row["homeLocationX"]), 721 Convert.ToSingle(row["homeLocationX"]),
722 Convert.ToSingle(row["homeLocationY"]), 722 Convert.ToSingle(row["homeLocationY"]),
723 Convert.ToSingle(row["homeLocationZ"]) 723 Convert.ToSingle(row["homeLocationZ"])
724 ); 724 );
725 user.HomeLookAt = new LLVector3( 725 user.HomeLookAt = new Vector3(
726 Convert.ToSingle(row["homeLookAtX"]), 726 Convert.ToSingle(row["homeLookAtX"]),
727 Convert.ToSingle(row["homeLookAtY"]), 727 Convert.ToSingle(row["homeLookAtY"]),
728 Convert.ToSingle(row["homeLookAtZ"]) 728 Convert.ToSingle(row["homeLookAtZ"])
729 ); 729 );
730 730
731 LLUUID regionID = LLUUID.Zero; 731 UUID regionID = UUID.Zero;
732 LLUUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero 732 UUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
733 user.HomeRegionID = regionID; 733 user.HomeRegionID = regionID;
734 734
735 user.Created = Convert.ToInt32(row["created"]); 735 user.Created = Convert.ToInt32(row["created"]);
736 user.LastLogin = Convert.ToInt32(row["lastLogin"]); 736 user.LastLogin = Convert.ToInt32(row["lastLogin"]);
737 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 737 user.RootInventoryFolderID = new UUID((String) row["rootInventoryFolderID"]);
738 user.UserInventoryURI = (String) row["userInventoryURI"]; 738 user.UserInventoryURI = (String) row["userInventoryURI"];
739 user.UserAssetURI = (String) row["userAssetURI"]; 739 user.UserAssetURI = (String) row["userAssetURI"];
740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); 741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
742 user.AboutText = (String) row["profileAboutText"]; 742 user.AboutText = (String) row["profileAboutText"];
743 user.FirstLifeAboutText = (String) row["profileFirstText"]; 743 user.FirstLifeAboutText = (String) row["profileFirstText"];
744 LLUUID.TryParse((String)row["profileImage"], out tmp); 744 UUID.TryParse((String)row["profileImage"], out tmp);
745 user.Image = tmp; 745 user.Image = tmp;
746 LLUUID.TryParse((String)row["profileFirstImage"], out tmp); 746 UUID.TryParse((String)row["profileFirstImage"], out tmp);
747 user.FirstLifeImage = tmp; 747 user.FirstLifeImage = tmp;
748 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); 748 user.WebLoginKey = new UUID((String) row["webLoginKey"]);
749 user.UserFlags = Convert.ToInt32(row["userFlags"]); 749 user.UserFlags = Convert.ToInt32(row["userFlags"]);
750 user.GodLevel = Convert.ToInt32(row["godLevel"]); 750 user.GodLevel = Convert.ToInt32(row["godLevel"]);
751 user.CustomType = row["customType"].ToString(); 751 user.CustomType = row["customType"].ToString();
752 user.Partner = new LLUUID((String) row["partner"]); 752 user.Partner = new UUID((String) row["partner"]);
753 753
754 return user; 754 return user;
755 } 755 }
@@ -814,18 +814,18 @@ namespace OpenSim.Data.SQLite
814 { 814 {
815 UserAgentData ua = new UserAgentData(); 815 UserAgentData ua = new UserAgentData();
816 816
817 ua.ProfileID = new LLUUID((String) row["UUID"]); 817 ua.ProfileID = new UUID((String) row["UUID"]);
818 ua.AgentIP = (String) row["agentIP"]; 818 ua.AgentIP = (String) row["agentIP"];
819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]); 819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]);
820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]); 820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
821 ua.SessionID = new LLUUID((String) row["sessionID"]); 821 ua.SessionID = new UUID((String) row["sessionID"]);
822 ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]); 822 ua.SecureSessionID = new UUID((String) row["secureSessionID"]);
823 ua.InitialRegion = new LLUUID((String) row["regionID"]); 823 ua.InitialRegion = new UUID((String) row["regionID"]);
824 ua.LoginTime = Convert.ToInt32(row["loginTime"]); 824 ua.LoginTime = Convert.ToInt32(row["loginTime"]);
825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]); 825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
826 ua.Region = new LLUUID((String) row["currentRegion"]); 826 ua.Region = new UUID((String) row["currentRegion"]);
827 ua.Handle = Convert.ToUInt64(row["currentHandle"]); 827 ua.Handle = Convert.ToUInt64(row["currentHandle"]);
828 ua.Position = new LLVector3( 828 ua.Position = new Vector3(
829 Convert.ToSingle(row["currentPosX"]), 829 Convert.ToSingle(row["currentPosX"]),
830 Convert.ToSingle(row["currentPosY"]), 830 Convert.ToSingle(row["currentPosY"]),
831 Convert.ToSingle(row["currentPosZ"]) 831 Convert.ToSingle(row["currentPosZ"])
@@ -906,7 +906,7 @@ namespace OpenSim.Data.SQLite
906 906
907 } 907 }
908 908
909 override public void ResetAttachments(LLUUID userID) 909 override public void ResetAttachments(UUID userID)
910 { 910 {
911 } 911 }
912 } 912 }