From 108d89f89436556c8f4662197903c374db943f7d Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 28 Jun 2007 16:17:20 +0000
Subject: *Master User is now set up *Added support for getting user profile
 information from remote grid server (untested) *Updated prebuild.xml

---
 .../Region/Communications/OGS1/GridCommsManager.cs |  2 +-
 .../Region/Communications/OGS1/OGSUserServices.cs  | 63 ++++++++++++++++++++++
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj |  4 +-
 .../OpenSim.Region.Communications.OGS1.dll.build   |  4 +-
 4 files changed, 68 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1')

diff --git a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
index 77848fa..2bf9536 100644
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
         {
             GridServer = gridInterComms;
             InterRegion = gridInterComms;
-            UserServer = new OGSUserServices();
+            UserServer = new OGSUserServices(this);
         }
     }
 }
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index 48d3018..d41bdaf 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -1,24 +1,87 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Data;
 using libsecondlife;
 
+using Nwc.XmlRpc;
+
 namespace OpenSim.Region.Communications.OGS1
 {
     public class OGSUserServices :IUserServices
     {
+        GridCommsManager m_parent;
+        public OGSUserServices(GridCommsManager parent)
+        {
+            m_parent = parent;
+        }
+
+        public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
+        {
+            UserProfileData userData = new UserProfileData();
+            userData.username = (string)data["firstname"];
+            userData.surname = (string)data["lastname"];
+            userData.UUID = new LLUUID((string)data["uuid"]);
+            userData.userInventoryURI = (string)data["server_inventory"];
+            userData.userAssetURI = (string)data["server_asset"];
+            userData.profileFirstText = (string)data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
+            userData.profileCanDoMask = (uint)data["profile_can_do"];
+            userData.profileWantDoMask = (uint)data["profile_want_do"];
+            userData.profileImage = new LLUUID((string)data["profile_image"]);
+            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.homeLocation = new LLVector3();
+            userData.homeLookAt = new LLVector3();
+
+            return userData;
+        }
         public UserProfileData GetUserProfile(string firstName, string lastName)
         {
             return GetUserProfile(firstName + " " + lastName);
         }
         public UserProfileData GetUserProfile(string name)
         {
+
+            try
+            {
+                Hashtable param = new Hashtable();
+                param["avatar_name"] = name;
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            }
             return null;
         }
         public UserProfileData GetUserProfile(LLUUID avatarID)
         {
+            try
+            {
+
+                Hashtable param = new Hashtable();
+                param["avatar_uuid"] = avatarID.ToString();
+                IList parameters = new ArrayList();
+                parameters.Add(param);
+                XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
+                XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
+                Hashtable respData = (Hashtable)resp.Value;
+
+                return ConvertXMLRPCDataToUserProfile(respData);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+            }
             return null;
         }
 
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641..2124bd9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GridCommsManager.cs">
+    <Compile Include="OGSInterSimComms.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OGSInterSimComms.cs">
+    <Compile Include="GridCommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="OGSUserServices.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 21bb15c..1a7cf69 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="GridCommsManager.cs" />
-                <include name="OGS1GridServices.cs" />
                 <include name="OGSInterSimComms.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="GridCommsManager.cs" />
                 <include name="OGSUserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
-- 
cgit v1.1