* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.

1 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 120d90c..b42427b 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -29,13 +29,13 @@ namespace OpenSim.Grid.UserServer
         {

             // Load information from the gridserver

             SimProfileData SimInfo = new SimProfileData();

-            SimInfo = SimInfo.RequestSimProfileData(theUser.CurrentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);

+            SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);

 

             // Customise the response

             // Home Location

             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() + "]}";

+                "'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

             Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);

@@ -53,23 +53,23 @@ namespace OpenSim.Grid.UserServer
 

             // Prepare notification

             Hashtable SimParams = new Hashtable();

-            SimParams["session_id"] = theUser.CurrentAgent.sessionID.ToString();

-            SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();

-            SimParams["firstname"] = theUser.Firstname;

-            SimParams["lastname"] = theUser.Lastname;

+            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();

+            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();

+            SimParams["firstname"] = theUser.username;

+            SimParams["lastname"] = theUser.surname;

             SimParams["agent_id"] = theUser.UUID.ToString();

             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();

-            SimParams["regionhandle"] = theUser.CurrentAgent.currentHandle.ToString();

+            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();

+            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();

+            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();

+            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();

             SimParams["caps_path"] = capsPath;

             ArrayList SendParams = new ArrayList();

             SendParams.Add(SimParams);

 

             // Update agent with target sim

-            theUser.CurrentAgent.currentRegion = SimInfo.UUID;

-            theUser.CurrentAgent.currentHandle = SimInfo.regionHandle;

+            theUser.currentAgent.currentRegion = SimInfo.UUID;

+            theUser.currentAgent.currentHandle = SimInfo.regionHandle;

 

             System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);

             // Send