aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLUserData.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/MySQL/MySQLUserData.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLUserData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs62
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 8d0b177..42983b1 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
@@ -221,15 +221,15 @@ namespace OpenSim.Data.MySQL
221 221
222 #region User Friends List Data 222 #region User Friends List Data
223 223
224 public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 224 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
225 { 225 {
226 MySQLSuperManager dbm = GetLockedConnection(); 226 MySQLSuperManager dbm = GetLockedConnection();
227 227
228 int dtvalue = Util.UnixTimeSinceEpoch(); 228 int dtvalue = Util.UnixTimeSinceEpoch();
229 229
230 Dictionary<string, string> param = new Dictionary<string, string>(); 230 Dictionary<string, string> param = new Dictionary<string, string>();
231 param["?ownerID"] = friendlistowner.UUID.ToString(); 231 param["?ownerID"] = friendlistowner.ToString();
232 param["?friendID"] = friend.UUID.ToString(); 232 param["?friendID"] = friend.ToString();
233 param["?friendPerms"] = perms.ToString(); 233 param["?friendPerms"] = perms.ToString();
234 param["?datetimestamp"] = dtvalue.ToString(); 234 param["?datetimestamp"] = dtvalue.ToString();
235 235
@@ -265,13 +265,13 @@ namespace OpenSim.Data.MySQL
265 } 265 }
266 } 266 }
267 267
268 public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 268 public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
269 { 269 {
270 MySQLSuperManager dbm = GetLockedConnection(); 270 MySQLSuperManager dbm = GetLockedConnection();
271 271
272 Dictionary<string, string> param = new Dictionary<string, string>(); 272 Dictionary<string, string> param = new Dictionary<string, string>();
273 param["?ownerID"] = friendlistowner.UUID.ToString(); 273 param["?ownerID"] = friendlistowner.ToString();
274 param["?friendID"] = friend.UUID.ToString(); 274 param["?friendID"] = friend.ToString();
275 275
276 try 276 try
277 { 277 {
@@ -299,13 +299,13 @@ namespace OpenSim.Data.MySQL
299 } 299 }
300 } 300 }
301 301
302 public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 302 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
303 { 303 {
304 MySQLSuperManager dbm = GetLockedConnection(); 304 MySQLSuperManager dbm = GetLockedConnection();
305 305
306 Dictionary<string, string> param = new Dictionary<string, string>(); 306 Dictionary<string, string> param = new Dictionary<string, string>();
307 param["?ownerID"] = friendlistowner.UUID.ToString(); 307 param["?ownerID"] = friendlistowner.ToString();
308 param["?friendID"] = friend.UUID.ToString(); 308 param["?friendID"] = friend.ToString();
309 param["?friendPerms"] = perms.ToString(); 309 param["?friendPerms"] = perms.ToString();
310 310
311 try 311 try
@@ -330,13 +330,13 @@ namespace OpenSim.Data.MySQL
330 } 330 }
331 } 331 }
332 332
333 public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 333 public override List<FriendListItem> GetUserFriendList(UUID friendlistowner)
334 { 334 {
335 MySQLSuperManager dbm = GetLockedConnection(); 335 MySQLSuperManager dbm = GetLockedConnection();
336 List<FriendListItem> Lfli = new List<FriendListItem>(); 336 List<FriendListItem> Lfli = new List<FriendListItem>();
337 337
338 Dictionary<string, string> param = new Dictionary<string, string>(); 338 Dictionary<string, string> param = new Dictionary<string, string>();
339 param["?ownerID"] = friendlistowner.UUID.ToString(); 339 param["?ownerID"] = friendlistowner.ToString();
340 340
341 try 341 try
342 { 342 {
@@ -352,8 +352,8 @@ namespace OpenSim.Data.MySQL
352 while (reader.Read()) 352 while (reader.Read())
353 { 353 {
354 FriendListItem fli = new FriendListItem(); 354 FriendListItem fli = new FriendListItem();
355 fli.FriendListOwner = new LLUUID((string) reader["ownerID"]); 355 fli.FriendListOwner = new UUID((string) reader["ownerID"]);
356 fli.Friend = new LLUUID((string) reader["friendID"]); 356 fli.Friend = new UUID((string) reader["friendID"]);
357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]); 357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]);
358 358
359 // This is not a real column in the database table, it's a joined column from the opposite record 359 // This is not a real column in the database table, it's a joined column from the opposite record
@@ -381,12 +381,12 @@ namespace OpenSim.Data.MySQL
381 381
382 #endregion 382 #endregion
383 383
384 public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 384 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
385 { 385 {
386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
387 } 387 }
388 388
389 public override List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 389 public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
390 { 390 {
391 MySQLSuperManager dbm = GetLockedConnection(); 391 MySQLSuperManager dbm = GetLockedConnection();
392 392
@@ -413,7 +413,7 @@ namespace OpenSim.Data.MySQL
413 while (reader.Read()) 413 while (reader.Read())
414 { 414 {
415 AvatarPickerAvatar user = new AvatarPickerAvatar(); 415 AvatarPickerAvatar user = new AvatarPickerAvatar();
416 user.AvatarID = new LLUUID((string) reader["UUID"]); 416 user.AvatarID = new UUID((string) reader["UUID"]);
417 user.firstName = (string) reader["username"]; 417 user.firstName = (string) reader["username"];
418 user.lastName = (string) reader["lastname"]; 418 user.lastName = (string) reader["lastname"];
419 returnlist.Add(user); 419 returnlist.Add(user);
@@ -449,7 +449,7 @@ namespace OpenSim.Data.MySQL
449 while (reader.Read()) 449 while (reader.Read())
450 { 450 {
451 AvatarPickerAvatar user = new AvatarPickerAvatar(); 451 AvatarPickerAvatar user = new AvatarPickerAvatar();
452 user.AvatarID = new LLUUID((string) reader["UUID"]); 452 user.AvatarID = new UUID((string) reader["UUID"]);
453 user.firstName = (string) reader["username"]; 453 user.firstName = (string) reader["username"];
454 user.lastName = (string) reader["lastname"]; 454 user.lastName = (string) reader["lastname"];
455 returnlist.Add(user); 455 returnlist.Add(user);
@@ -476,7 +476,7 @@ namespace OpenSim.Data.MySQL
476 /// </summary> 476 /// </summary>
477 /// <param name="uuid">User UUID</param> 477 /// <param name="uuid">User UUID</param>
478 /// <returns>User profile data</returns> 478 /// <returns>User profile data</returns>
479 public override UserProfileData GetUserByUUID(LLUUID uuid) 479 public override UserProfileData GetUserByUUID(UUID uuid)
480 { 480 {
481 MySQLSuperManager dbm = GetLockedConnection(); 481 MySQLSuperManager dbm = GetLockedConnection();
482 try 482 try
@@ -533,13 +533,13 @@ namespace OpenSim.Data.MySQL
533 /// <param name="AgentID"></param> 533 /// <param name="AgentID"></param>
534 /// <param name="WebLoginKey"></param> 534 /// <param name="WebLoginKey"></param>
535 /// <remarks>is it still used ?</remarks> 535 /// <remarks>is it still used ?</remarks>
536 public override void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 536 public override void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
537 { 537 {
538 MySQLSuperManager dbm = GetLockedConnection(); 538 MySQLSuperManager dbm = GetLockedConnection();
539 539
540 Dictionary<string, string> param = new Dictionary<string, string>(); 540 Dictionary<string, string> param = new Dictionary<string, string>();
541 param["?UUID"] = AgentID.UUID.ToString(); 541 param["?UUID"] = AgentID.ToString();
542 param["?webLoginKey"] = WebLoginKey.UUID.ToString(); 542 param["?webLoginKey"] = WebLoginKey.ToString();
543 543
544 try 544 try
545 { 545 {
@@ -565,7 +565,7 @@ namespace OpenSim.Data.MySQL
565 /// </summary> 565 /// </summary>
566 /// <param name="uuid">The accounts UUID</param> 566 /// <param name="uuid">The accounts UUID</param>
567 /// <returns>The users session</returns> 567 /// <returns>The users session</returns>
568 public override UserAgentData GetAgentByUUID(LLUUID uuid) 568 public override UserAgentData GetAgentByUUID(UUID uuid)
569 { 569 {
570 MySQLSuperManager dbm = GetLockedConnection(); 570 MySQLSuperManager dbm = GetLockedConnection();
571 571
@@ -682,7 +682,7 @@ namespace OpenSim.Data.MySQL
682 /// <param name="to">The receivers account ID</param> 682 /// <param name="to">The receivers account ID</param>
683 /// <param name="amount">The amount to transfer</param> 683 /// <param name="amount">The amount to transfer</param>
684 /// <returns>Success?</returns> 684 /// <returns>Success?</returns>
685 public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 685 public override bool MoneyTransferRequest(UUID from, UUID to, uint amount)
686 { 686 {
687 return false; 687 return false;
688 } 688 }
@@ -695,7 +695,7 @@ namespace OpenSim.Data.MySQL
695 /// <param name="to">The receivers account ID</param> 695 /// <param name="to">The receivers account ID</param>
696 /// <param name="item">The item to transfer</param> 696 /// <param name="item">The item to transfer</param>
697 /// <returns>Success?</returns> 697 /// <returns>Success?</returns>
698 public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 698 public override bool InventoryTransferRequest(UUID from, UUID to, UUID item)
699 { 699 {
700 return false; 700 return false;
701 } 701 }
@@ -705,7 +705,7 @@ namespace OpenSim.Data.MySQL
705 /// TODO: stubs for now to get us to a compiling state gently 705 /// TODO: stubs for now to get us to a compiling state gently
706 /// override 706 /// override
707 /// </summary> 707 /// </summary>
708 public override AvatarAppearance GetUserAppearance(LLUUID user) 708 public override AvatarAppearance GetUserAppearance(UUID user)
709 { 709 {
710 MySQLSuperManager dbm = GetLockedConnection(); 710 MySQLSuperManager dbm = GetLockedConnection();
711 try 711 try
@@ -744,7 +744,7 @@ namespace OpenSim.Data.MySQL
744 /// <param name="user">The user UUID</param> 744 /// <param name="user">The user UUID</param>
745 /// <param name="appearance">The avatar appearance</param> 745 /// <param name="appearance">The avatar appearance</param>
746 // override 746 // override
747 public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 747 public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
748 { 748 {
749 MySQLSuperManager dbm = GetLockedConnection(); 749 MySQLSuperManager dbm = GetLockedConnection();
750 try 750 try
@@ -783,7 +783,7 @@ namespace OpenSim.Data.MySQL
783 get { return "0.1"; } 783 get { return "0.1"; }
784 } 784 }
785 785
786 public Hashtable GetUserAttachments(LLUUID agentID) 786 public Hashtable GetUserAttachments(UUID agentID)
787 { 787 {
788 MySQLSuperManager dbm = GetLockedConnection(); 788 MySQLSuperManager dbm = GetLockedConnection();
789 789
@@ -814,7 +814,7 @@ namespace OpenSim.Data.MySQL
814 } 814 }
815 } 815 }
816 816
817 public void UpdateUserAttachments(LLUUID agentID, Hashtable data) 817 public void UpdateUserAttachments(UUID agentID, Hashtable data)
818 { 818 {
819 MySQLSuperManager dbm = GetLockedConnection(); 819 MySQLSuperManager dbm = GetLockedConnection();
820 try 820 try
@@ -827,7 +827,7 @@ namespace OpenSim.Data.MySQL
827 } 827 }
828 } 828 }
829 829
830 public override void ResetAttachments(LLUUID userID) 830 public override void ResetAttachments(UUID userID)
831 { 831 {
832 MySQLSuperManager dbm = GetLockedConnection(); 832 MySQLSuperManager dbm = GetLockedConnection();
833 833
@@ -847,4 +847,4 @@ namespace OpenSim.Data.MySQL
847 } 847 }
848 } 848 }
849 } 849 }
850} \ No newline at end of file 850}