2 files changed, 65 insertions, 75 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index e492872..4772960 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}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
@@ -25,71 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-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
-    ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000})
+                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
+                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
+                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        EndGlobalSection
-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                HideSolutionNode = FALSE
-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index 6f5f054..14e330b 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -55,7 +55,7 @@ namespace OpenGridServices.UserServer
        /// </summary>
        /// <param name="response">The existing response</param>
        /// <param name="theUser">The user profile</param>
-        public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
+        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
        {
            // Load information from the gridserver
            SimProfile SimInfo = new SimProfile();
@@ -63,15 +63,15 @@ namespace OpenGridServices.UserServer
            // Customise the response
            // Home Location
-            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +
+            response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +
                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
            // Destination
-            response["sim_ip"] = SimInfo.sim_ip;
+            response.SimAddress = SimInfo.sim_ip;
-            response["sim_port"] = (Int32)SimInfo.sim_port;
+            response.SimPort = (Int32)SimInfo.sim_port;
-            response["region_y"] = (Int32)SimInfo.RegionLocY * 256;
+            response.RegionX = SimInfo.RegionLocY ;
-            response["region_x"] = (Int32)SimInfo.RegionLocX * 256;
+            response.RegionY = SimInfo.RegionLocX ;
            // Notify the target of an incoming user
            Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");
@@ -83,7 +83,7 @@ namespace OpenGridServices.UserServer
            SimParams["firstname"] = theUser.username;
            SimParams["lastname"] = theUser.surname;
            SimParams["agent_id"] = theUser.UUID.ToString();
-            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response["circuit_code"]);
+            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();

diff --git a/OpenGridServices.sln b/OpenGridServices.sln index e492872..4772960 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}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"	3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
4	EndProject	4	EndProject
5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"	5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
@@ -25,71 +25,61 @@ EndProject
25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"	25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-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	({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})	33	{B0027747-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
34	({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})	34	{B0027747-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
35	({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})	35	{B0027747-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
36	({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})	36	{B0027747-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
37	({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})	37	{62CDF671-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
38	({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})	38	{62CDF671-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
39	({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000})	39	{62CDF671-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
40	({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})	40	{62CDF671-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
41	EndGlobalSection	41	{39BD9497-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
42	GlobalSection(ProjectConfigurationPlatforms) = postSolution	42	{39BD9497-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
43	{B0027747-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	43	{39BD9497-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
44	{B0027747-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	44	{39BD9497-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
45	{B0027747-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	45	{0A563AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
46	{B0027747-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	46	{0A563AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
47	{62CDF671-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	47	{0A563AC1-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
48	{62CDF671-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	48	{0A563AC1-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
49	{62CDF671-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	49	{0F3C3AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
50	{62CDF671-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	50	{0F3C3AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
51	{39BD9497-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	51	{0F3C3AC1-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
52	{39BD9497-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	52	{0F3C3AC1-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
53	{39BD9497-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	53	{1E3F341A-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
54	{39BD9497-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	54	{1E3F341A-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
55	{0A563AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	55	{1E3F341A-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
56	{0A563AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	56	{1E3F341A-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
57	{0A563AC1-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	57	{7924FD35-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
58	{0A563AC1-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	58	{7924FD35-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
59	{0F3C3AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	59	{7924FD35-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
60	{0F3C3AC1-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	60	{7924FD35-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
61	{0F3C3AC1-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	61	{DA9A7391-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
62	{0F3C3AC1-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	62	{DA9A7391-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	{1E3F341A-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	63	{DA9A7391-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	{1E3F341A-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	64	{DA9A7391-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
65	{1E3F341A-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	65	{0021261B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66	{1E3F341A-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	66	{0021261B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67	{7924FD35-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	67	{0021261B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68	{7924FD35-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	68	{0021261B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	{7924FD35-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	69	{21BFC8E2-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	{7924FD35-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	70	{21BFC8E2-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	{DA9A7391-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	71	{21BFC8E2-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
72	{DA9A7391-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	72	{21BFC8E2-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
73	{DA9A7391-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	73	{66591469-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
74	{DA9A7391-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	74	{66591469-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	{0021261B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	75	{66591469-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	{0021261B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	76	{66591469-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	{0021261B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	77	{7E494328-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
78	{0021261B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	78	{7E494328-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
79	{21BFC8E2-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	79	{7E494328-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
80	{21BFC8E2-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	80	{7E494328-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
81	{21BFC8E2-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	81	EndGlobalSection
82	{21BFC8E2-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	82	GlobalSection(SolutionProperties) = preSolution
83	{66591469-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	83	HideSolutionNode = FALSE
84	{66591469-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	84	EndGlobalSection
85	{66591469-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
86	{66591469-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
87	{7E494328-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
88	{7E494328-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
89	{7E494328-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
90	{7E494328-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
91	EndGlobalSection
92	GlobalSection(SolutionProperties) = preSolution
93	HideSolutionNode = FALSE
94	EndGlobalSection
95	EndGlobal	85	EndGlobal


diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs index 6f5f054..14e330b 100644 --- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs +++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -55,7 +55,7 @@ namespace OpenGridServices.UserServer
55	/// </summary>	55	/// </summary>
56	/// <param name="response">The existing response</param>	56	/// <param name="response">The existing response</param>
57	/// <param name="theUser">The user profile</param>	57	/// <param name="theUser">The user profile</param>
58	public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)	58	public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
59	{	59	{
60	// Load information from the gridserver	60	// Load information from the gridserver
61	SimProfile SimInfo = new SimProfile();	61	SimProfile SimInfo = new SimProfile();
@@ -63,15 +63,15 @@ namespace OpenGridServices.UserServer
63		63
64	// Customise the response	64	// Customise the response
65	// Home Location	65	// Home Location
66	response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +	66	response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +
67	"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +	67	"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
68	"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";	68	"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
69		69
70	// Destination	70	// Destination
71	response["sim_ip"] = SimInfo.sim_ip;	71	response.SimAddress = SimInfo.sim_ip;
72	response["sim_port"] = (Int32)SimInfo.sim_port;	72	response.SimPort = (Int32)SimInfo.sim_port;
73	response["region_y"] = (Int32)SimInfo.RegionLocY * 256;	73	response.RegionX = SimInfo.RegionLocY ;
74	response["region_x"] = (Int32)SimInfo.RegionLocX * 256;	74	response.RegionY = SimInfo.RegionLocX ;
75		75
76	// Notify the target of an incoming user	76	// Notify the target of an incoming user
77	Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");	77	Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")");
@@ -83,7 +83,7 @@ namespace OpenGridServices.UserServer
83	SimParams["firstname"] = theUser.username;	83	SimParams["firstname"] = theUser.username;
84	SimParams["lastname"] = theUser.surname;	84	SimParams["lastname"] = theUser.surname;
85	SimParams["agent_id"] = theUser.UUID.ToString();	85	SimParams["agent_id"] = theUser.UUID.ToString();
86	SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response["circuit_code"]);	86	SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
87	SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();	87	SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
88	SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();	88	SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
89	SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();	89	SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();