From 3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 22:28:51 +0000
Subject: * 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.

---
 .../Region/Communications/OGS1/OGS1UserServices.cs   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1/OGS1UserServices.cs')

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
         public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
         {
             Hashtable param = new Hashtable();
-            param["avatar_uuid"] = userid.ToString();
-            param["region_uuid"] = regionid.ToString();
+            param["avatar_uuid"] = userid.Guid.ToString();
+            param["region_uuid"] = regionid.Guid.ToString();
             param["region_handle"] = regionhandle.ToString();
             param["region_pos_x"] = posx.ToString();
             param["region_pos_y"] = posy.ToString();
@@ -528,8 +528,8 @@ namespace OpenSim.Region.Communications.OGS1
             try
             {
                 Hashtable param = new Hashtable();
-                param["ownerID"] = friendlistowner.ToString();
-                param["friendID"] = friend.ToString();
+                param["ownerID"] = friendlistowner.Guid.ToString();
+                param["friendID"] = friend.Guid.ToString();
                 param["friendPerms"] = perms.ToString();
                 IList parameters = new ArrayList();
                 parameters.Add(param);
@@ -580,8 +580,8 @@ namespace OpenSim.Region.Communications.OGS1
             try
             {
                 Hashtable param = new Hashtable();
-                param["ownerID"] = friendlistowner.ToString();
-                param["friendID"] = friend.ToString();
+                param["ownerID"] = friendlistowner.Guid.ToString();
+                param["friendID"] = friend.Guid.ToString();
 
                 IList parameters = new ArrayList();
                 parameters.Add(param);
@@ -632,8 +632,8 @@ namespace OpenSim.Region.Communications.OGS1
             try
             {
                 Hashtable param = new Hashtable();
-                param["ownerID"] = friendlistowner.ToString();
-                param["friendID"] = friend.ToString();
+                param["ownerID"] = friendlistowner.Guid.ToString();
+                param["friendID"] = friend.Guid.ToString();
                 param["friendPerms"] = perms.ToString();
                 IList parameters = new ArrayList();
                 parameters.Add(param);
@@ -672,7 +672,7 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
         /// <summary>
-        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
+        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner
         /// </summary>
         /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
         public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Communications.OGS1
             try
             {
                 Hashtable param = new Hashtable();
-                param["ownerID"] = friendlistowner.ToString();
+                param["ownerID"] = friendlistowner.Guid.ToString();
 
                 IList parameters = new ArrayList();
                 parameters.Add(param);
-- 
cgit v1.1