*OGS1 Key2Name/Name2Key works

*OGS1 doesnt crash on startup anymore
author: mingchen 2007-07-02 21:02:11 +0000
committer: mingchen 2007-07-02 21:02:11 +0000
commit: 67af17fdd185e4a70046ac3583d3c64e6c3c8fb9 (patch)
tree: d62c87408f2adbf84df7c18277c0d7fa8693e186
parent: * Added conceptual LlsdMethod Demo to SimpleApp (work in progress) (diff)
download: opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.zip
opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.gz
opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.bz2
opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.xz
4 files changed, 71 insertions, 81 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
+                Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
+                Release|Any CPU = Release|Any CPU
-  EndGlobalSection
+        EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  EndGlobalSection
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                HideSolutionNode = FALSE
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        EndGlobalSection
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
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.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
-            userData.profileWantDoMask = (uint)data["profile_want_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)
+            //catch (Exception e)
-            {
+            //{
-                Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+            //    Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
-            }
+            //}
-            return null;
+            //return null;
        }
        public UserProfileData GetUserProfile(LLUUID avatarID)
        {
author	mingchen	2007-07-02 21:02:11 +0000
committer	mingchen	2007-07-02 21:02:11 +0000
commit	67af17fdd185e4a70046ac3583d3c64e6c3c8fb9 (patch)
tree	d62c87408f2adbf84df7c18277c0d7fa8693e186
parent	* Added conceptual LlsdMethod Demo to SimpleApp (work in progress) (diff)
download	opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.zip opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.gz opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.bz2 opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.xz

diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 2343bc0..5f47b6b 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1	Microsoft Visual Studio Solution File, Format Version 9.00	1	Microsoft Visual Studio Solution File, Format Version 9.00
2	# Visual Studio 2005	2	# Visual C# Express 2005
3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"	3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4	EndProject	4	EndProject
5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"	5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"	25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26	EndProject	26	EndProject
27	Global	27	Global
28	GlobalSection(SolutionConfigurationPlatforms) = preSolution	28	GlobalSection(SolutionConfigurationPlatforms) = preSolution
29	Debug\|Any CPU = Debug\|Any CPU	29	Debug\|Any CPU = Debug\|Any CPU
30	Release\|Any CPU = Release\|Any CPU	30	Release\|Any CPU = Release\|Any CPU
31	EndGlobalSection	31	EndGlobalSection
32	GlobalSection(ProjectDependencies) = postSolution	32	GlobalSection(ProjectConfigurationPlatforms) = postSolution
33	({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	33	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
34	({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	34	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
35	({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	35	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
36	({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	36	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
37	({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	37	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
38	({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	38	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
39	({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})	39	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
40	({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	40	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
41	({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})	41	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
42	EndGlobalSection	42	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
43	GlobalSection(ProjectConfigurationPlatforms) = postSolution	43	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
44	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	44	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
45	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	45	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
46	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	46	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
47	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	47	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
48	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	48	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
49	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	49	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
50	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	50	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
51	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	51	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
52	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	52	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
53	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	53	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
54	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	54	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
55	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	55	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
56	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	56	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
57	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	57	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
58	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	58	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
59	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	59	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
60	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	60	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
61	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	61	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
62	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	62	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	63	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	64	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
65	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	65	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	66	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	67	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	68	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	69	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	70	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	71	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
72	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	72	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
73	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	73	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
74	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	74	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	75	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	76	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	77	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
78	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	78	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
79	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	79	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
80	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	80	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
81	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	81	EndGlobalSection
82	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	82	GlobalSection(SolutionProperties) = preSolution
83	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	83	HideSolutionNode = FALSE
84	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	84	EndGlobalSection
85	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
86	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
87	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
88	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
89	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
90	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
91	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
92	EndGlobalSection
93	GlobalSection(SolutionProperties) = preSolution
94	HideSolutionNode = FALSE
95	EndGlobalSection
96	EndGlobal	85	EndGlobal


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
223	SimProfileData TheSim = null;	223	SimProfileData TheSim = null;
224	Hashtable requestData = (Hashtable)request.Params[0];	224	Hashtable requestData = (Hashtable)request.Params[0];
225		225
		226	Console.WriteLine("WOOT: " + requestData.ToString());
226	if (requestData.ContainsKey("UUID"))	227	if (requestData.ContainsKey("UUID"))
227	{	228	{
228	TheSim = getRegion(new LLUUID((string)requestData["UUID"]));	229	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
48	/// </summary>	48	/// </summary>
49	public class OpenGrid_Main : conscmd_callback	49	public class OpenGrid_Main : conscmd_callback
50	{	50	{
51	private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";	51	private string ConfigDll = "OpenSim.Grid.GridServer.Config.dll";
52	private string GridDll = "OpenSim.Framework.Data.MySQL.dll";	52	private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
53	public GridConfig Cfg;	53	public GridConfig Cfg;
54		54


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
35	userData.userAssetURI = (string)data["server_asset"];	35	userData.userAssetURI = (string)data["server_asset"];
36	userData.profileFirstText = (string)data["profile_firstlife_about"];	36	userData.profileFirstText = (string)data["profile_firstlife_about"];
37	userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);	37	userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
38	userData.profileCanDoMask = (uint)data["profile_can_do"];	38	userData.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
39	userData.profileWantDoMask = (uint)data["profile_want_do"];	39	userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
40	userData.profileImage = new LLUUID((string)data["profile_image"]);	40	userData.profileImage = new LLUUID((string)data["profile_image"]);
41	userData.lastLogin = (int)data["profile_lastlogin"];	41	userData.lastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
42	userData.homeLocation = new LLVector3();	42	userData.homeLocation = new LLVector3();
43	userData.homeLookAt = new LLVector3();	43	userData.homeLookAt = new LLVector3();
44		44
@@ -51,8 +51,8 @@ namespace OpenSim.Region.Communications.OGS1
51	public UserProfileData GetUserProfile(string name)	51	public UserProfileData GetUserProfile(string name)
52	{	52	{
53		53
54	try	54	//try
55	{	55	//{
56	Hashtable param = new Hashtable();	56	Hashtable param = new Hashtable();
57	param["avatar_name"] = name;	57	param["avatar_name"] = name;
58	IList parameters = new ArrayList();	58	IList parameters = new ArrayList();
@@ -62,12 +62,12 @@ namespace OpenSim.Region.Communications.OGS1
62	Hashtable respData = (Hashtable)resp.Value;	62	Hashtable respData = (Hashtable)resp.Value;
63		63
64	return ConvertXMLRPCDataToUserProfile(respData);	64	return ConvertXMLRPCDataToUserProfile(respData);
65	}	65	//}
66	catch (Exception e)	66	//catch (Exception e)
67	{	67	//{
68	Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);	68	// Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
69	}	69	//}
70	return null;	70	//return null;
71	}	71	}
72	public UserProfileData GetUserProfile(LLUUID avatarID)	72	public UserProfileData GetUserProfile(LLUUID avatarID)
73	{	73	{