* UserProfileData meets code conventions

2 files changed, 32 insertions, 32 deletions

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index b42427b..120d90c 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.username;

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

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

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

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

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

             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

diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5db4901..c2d0a7a 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -83,31 +83,31 @@ namespace OpenSim.Grid.UserServer
             Hashtable responseData = new Hashtable();
 
             // Account information
-            responseData["firstname"] = profile.username;
-            responseData["lastname"] = profile.surname;
+            responseData["firstname"] = profile.Firstname;
+            responseData["lastname"] = profile.Lastname;
             responseData["uuid"] = profile.UUID.ToStringHyphenated();
             // Server Information
-            responseData["server_inventory"] = profile.userInventoryURI;
-            responseData["server_asset"] = profile.userAssetURI;
+            responseData["server_inventory"] = profile.UserInventoryUri;
+            responseData["server_asset"] = profile.UserAssetUri;
             // Profile Information
-            responseData["profile_about"] = profile.profileAboutText;
-            responseData["profile_firstlife_about"] = profile.profileFirstText;
-            responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();
-            responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
-            responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
-            responseData["profile_image"] = profile.profileImage.ToStringHyphenated();
-            responseData["profile_created"] = profile.created.ToString();
-            responseData["profile_lastlogin"] = profile.lastLogin.ToString();
+            responseData["profile_about"] = profile.ProfileAboutText;
+            responseData["profile_firstlife_about"] = profile.ProfileFirstText;
+            responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToStringHyphenated();
+            responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString();
+            responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString();
+            responseData["profile_image"] = profile.ProfileImage.ToStringHyphenated();
+            responseData["profile_created"] = profile.Created.ToString();
+            responseData["profile_lastlogin"] = profile.LastLogin.ToString();
             // Home region information
-            responseData["home_coordinates_x"] = profile.homeLocation.X.ToString();
-            responseData["home_coordinates_y"] = profile.homeLocation.Y.ToString();
-            responseData["home_coordinates_z"] = profile.homeLocation.Z.ToString();
+            responseData["home_coordinates_x"] = profile.HomeLocation.X.ToString();
+            responseData["home_coordinates_y"] = profile.HomeLocation.Y.ToString();
+            responseData["home_coordinates_z"] = profile.HomeLocation.Z.ToString();
 
-            responseData["home_region"] = profile.homeRegion.ToString();
+            responseData["home_region"] = profile.HomeRegion.ToString();
 
-            responseData["home_look_x"] = profile.homeLookAt.X.ToString();
-            responseData["home_look_y"] = profile.homeLookAt.Y.ToString();
-            responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
+            responseData["home_look_x"] = profile.HomeLookAt.X.ToString();
+            responseData["home_look_y"] = profile.HomeLookAt.Y.ToString();
+            responseData["home_look_z"] = profile.HomeLookAt.Z.ToString();
             response.Value = responseData;
 
             return response;