From 67af17fdd185e4a70046ac3583d3c64e6c3c8fb9 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Mon, 2 Jul 2007 21:02:11 +0000
Subject: *OGS1 Key2Name/Name2Key works *OGS1 doesnt crash on startup anymore

---
 OpenSim/Grid/GridServer/GridManager.cs             |  1 +
 OpenSim/Grid/GridServer/Main.cs                    |  2 +-
 .../Region/Communications/OGS1/OGS1UserServices.cs | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 47f7d00..e562721 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -223,6 +223,7 @@ namespace OpenSim.Grid.GridServer
             SimProfileData TheSim = null;
             Hashtable requestData = (Hashtable)request.Params[0];
 
+            Console.WriteLine("WOOT: " + requestData.ToString());
             if (requestData.ContainsKey("UUID"))
             {
                 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 5ac64b2..490f757 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.GridServer
     /// </summary>
     public class OpenGrid_Main : conscmd_callback
     {
-        private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
+        private string ConfigDll = "OpenSim.Grid.GridServer.Config.dll";
         private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
         public GridConfig Cfg;
 
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 856c447..6d428d0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -35,10 +35,10 @@ namespace OpenSim.Region.Communications.OGS1
             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.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
+            userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
             userData.profileImage = new LLUUID((string)data["profile_image"]);
-            userData.lastLogin = (int)data["profile_lastlogin"];
+            userData.lastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
             userData.homeLocation = new LLVector3();
             userData.homeLookAt = new LLVector3();
 
@@ -51,8 +51,8 @@ namespace OpenSim.Region.Communications.OGS1
         public UserProfileData GetUserProfile(string name)
         {
 
-            try
-            {
+            //try
+            //{
                 Hashtable param = new Hashtable();
                 param["avatar_name"] = name;
                 IList parameters = new ArrayList();
@@ -62,12 +62,12 @@ namespace OpenSim.Region.Communications.OGS1
                 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;
+            //}
+            //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)
         {
-- 
cgit v1.1