aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 22:28:51 +0000
committerTeravus Ovares2008-09-06 22:28:51 +0000
commit3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe (patch)
tree78f306a05c126927d06936cd87ef9e6e0a1cdaf7 /OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
parentMantis#1234. Thank you HomerHorwitz for a patch that: (diff)
downloadopensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.zip
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.gz
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.bz2
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.xz
* This changes gridcomms types back to our home grown wholy controlled types.
* These are different types then the OMV types because changing them causes just about all grid comms to break. If these were the libOMV types, then libOMV couldn't change them ever again after that.. or we'd have a breakage whenever they changed them. * This might introduce a map issue. Still checking it out.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1UserServices.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 317be13..36a82a8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -242,8 +242,8 @@ namespace OpenSim.Region.Communications.OGS1
242 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) 242 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
243 { 243 {
244 Hashtable param = new Hashtable(); 244 Hashtable param = new Hashtable();
245 param["avatar_uuid"] = userid.ToString(); 245 param["avatar_uuid"] = userid.Guid.ToString();
246 param["region_uuid"] = regionid.ToString(); 246 param["region_uuid"] = regionid.Guid.ToString();
247 param["region_handle"] = regionhandle.ToString(); 247 param["region_handle"] = regionhandle.ToString();
248 param["region_pos_x"] = posx.ToString(); 248 param["region_pos_x"] = posx.ToString();
249 param["region_pos_y"] = posy.ToString(); 249 param["region_pos_y"] = posy.ToString();
@@ -528,8 +528,8 @@ namespace OpenSim.Region.Communications.OGS1
528 try 528 try
529 { 529 {
530 Hashtable param = new Hashtable(); 530 Hashtable param = new Hashtable();
531 param["ownerID"] = friendlistowner.ToString(); 531 param["ownerID"] = friendlistowner.Guid.ToString();
532 param["friendID"] = friend.ToString(); 532 param["friendID"] = friend.Guid.ToString();
533 param["friendPerms"] = perms.ToString(); 533 param["friendPerms"] = perms.ToString();
534 IList parameters = new ArrayList(); 534 IList parameters = new ArrayList();
535 parameters.Add(param); 535 parameters.Add(param);
@@ -580,8 +580,8 @@ namespace OpenSim.Region.Communications.OGS1
580 try 580 try
581 { 581 {
582 Hashtable param = new Hashtable(); 582 Hashtable param = new Hashtable();
583 param["ownerID"] = friendlistowner.ToString(); 583 param["ownerID"] = friendlistowner.Guid.ToString();
584 param["friendID"] = friend.ToString(); 584 param["friendID"] = friend.Guid.ToString();
585 585
586 IList parameters = new ArrayList(); 586 IList parameters = new ArrayList();
587 parameters.Add(param); 587 parameters.Add(param);
@@ -632,8 +632,8 @@ namespace OpenSim.Region.Communications.OGS1
632 try 632 try
633 { 633 {
634 Hashtable param = new Hashtable(); 634 Hashtable param = new Hashtable();
635 param["ownerID"] = friendlistowner.ToString(); 635 param["ownerID"] = friendlistowner.Guid.ToString();
636 param["friendID"] = friend.ToString(); 636 param["friendID"] = friend.Guid.ToString();
637 param["friendPerms"] = perms.ToString(); 637 param["friendPerms"] = perms.ToString();
638 IList parameters = new ArrayList(); 638 IList parameters = new ArrayList();
639 parameters.Add(param); 639 parameters.Add(param);
@@ -672,7 +672,7 @@ namespace OpenSim.Region.Communications.OGS1
672 } 672 }
673 } 673 }
674 /// <summary> 674 /// <summary>
675 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner 675 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner
676 /// </summary> 676 /// </summary>
677 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 677 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
678 public List<FriendListItem> GetUserFriendList(UUID friendlistowner) 678 public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Communications.OGS1
682 try 682 try
683 { 683 {
684 Hashtable param = new Hashtable(); 684 Hashtable param = new Hashtable();
685 param["ownerID"] = friendlistowner.ToString(); 685 param["ownerID"] = friendlistowner.Guid.ToString();
686 686
687 IList parameters = new ArrayList(); 687 IList parameters = new ArrayList();
688 parameters.Add(param); 688 parameters.Add(param);