* UserProfileData meets code conventions

author: lbsa71 2007-10-05 11:27:46 +0000
committer: lbsa71 2007-10-05 11:27:46 +0000
commit: ed6168b96b687a2f44177af8200d13b427089099 (patch)
tree: 2d87efb9c800f06233cbef0612617eba2c931f68 /OpenSim/Grid
parent: == The "right name and place" commit == (diff)
download: opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.zip
opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.gz
opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.bz2
opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.xz
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() + "], " +
+                "'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() + "]}";
+                "'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["session_id"] = theUser.CurrentAgent.sessionID.ToString();
-            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
+            SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
-            SimParams["firstname"] = theUser.username;
+            SimParams["firstname"] = theUser.Firstname;
-            SimParams["lastname"] = theUser.surname;
+            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_x"] = theUser.CurrentAgent.currentPos.X.ToString();
-            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
+            SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
-            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
+            SimParams["startpos_z"] = theUser.CurrentAgent.currentPos.Z.ToString();
-            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.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.currentRegion = SimInfo.UUID;
-            theUser.currentAgent.currentHandle = SimInfo.regionHandle;
+            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["firstname"] = profile.Firstname;
-            responseData["lastname"] = profile.surname;
+            responseData["lastname"] = profile.Lastname;
            responseData["uuid"] = profile.UUID.ToStringHyphenated();
            // Server Information
-            responseData["server_inventory"] = profile.userInventoryURI;
+            responseData["server_inventory"] = profile.UserInventoryUri;
-            responseData["server_asset"] = profile.userAssetURI;
+            responseData["server_asset"] = profile.UserAssetUri;
            // Profile Information
-            responseData["profile_about"] = profile.profileAboutText;
+            responseData["profile_about"] = profile.ProfileAboutText;
-            responseData["profile_firstlife_about"] = profile.profileFirstText;
+            responseData["profile_firstlife_about"] = profile.ProfileFirstText;
-            responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();
+            responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToStringHyphenated();
-            responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
+            responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString();
-            responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
+            responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString();
-            responseData["profile_image"] = profile.profileImage.ToStringHyphenated();
+            responseData["profile_image"] = profile.ProfileImage.ToStringHyphenated();
-            responseData["profile_created"] = profile.created.ToString();
+            responseData["profile_created"] = profile.Created.ToString();
-            responseData["profile_lastlogin"] = profile.lastLogin.ToString();
+            responseData["profile_lastlogin"] = profile.LastLogin.ToString();
            // Home region information
-            responseData["home_coordinates_x"] = profile.homeLocation.X.ToString();
+            responseData["home_coordinates_x"] = profile.HomeLocation.X.ToString();
-            responseData["home_coordinates_y"] = profile.homeLocation.Y.ToString();
+            responseData["home_coordinates_y"] = profile.HomeLocation.Y.ToString();
-            responseData["home_coordinates_z"] = profile.homeLocation.Z.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_x"] = profile.HomeLookAt.X.ToString();
-            responseData["home_look_y"] = profile.homeLookAt.Y.ToString();
+            responseData["home_look_y"] = profile.HomeLookAt.Y.ToString();
-            responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
+            responseData["home_look_z"] = profile.HomeLookAt.Z.ToString();
            response.Value = responseData;
            return response;
author	lbsa71	2007-10-05 11:27:46 +0000
committer	lbsa71	2007-10-05 11:27:46 +0000
commit	ed6168b96b687a2f44177af8200d13b427089099 (patch)
tree	2d87efb9c800f06233cbef0612617eba2c931f68 /OpenSim/Grid
parent	== The "right name and place" commit == (diff)
download	opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.zip opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.gz opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.bz2 opensim-SC_OLD-ed6168b96b687a2f44177af8200d13b427089099.tar.xz

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
29	{	29	{
30	// Load information from the gridserver	30	// Load information from the gridserver
31	SimProfileData SimInfo = new SimProfileData();	31	SimProfileData SimInfo = new SimProfileData();
32	SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);	32	SimInfo = SimInfo.RequestSimProfileData(theUser.CurrentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
33		33
34	// Customise the response	34	// Customise the response
35	// Home Location	35	// Home Location
36	response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +	36	response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +
37	"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +	37	"'position':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " +
38	"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";	38	"'look_at':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}";
39		39
40	// Destination	40	// Destination
41	Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);	41	Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);
@@ -53,23 +53,23 @@ namespace OpenSim.Grid.UserServer
53		53
54	// Prepare notification	54	// Prepare notification
55	Hashtable SimParams = new Hashtable();	55	Hashtable SimParams = new Hashtable();
56	SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();	56	SimParams["session_id"] = theUser.CurrentAgent.sessionID.ToString();
57	SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();	57	SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
58	SimParams["firstname"] = theUser.username;	58	SimParams["firstname"] = theUser.Firstname;
59	SimParams["lastname"] = theUser.surname;	59	SimParams["lastname"] = theUser.Lastname;
60	SimParams["agent_id"] = theUser.UUID.ToString();	60	SimParams["agent_id"] = theUser.UUID.ToString();
61	SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);	61	SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
62	SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();	62	SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString();
63	SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();	63	SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
64	SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();	64	SimParams["startpos_z"] = theUser.CurrentAgent.currentPos.Z.ToString();
65	SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();	65	SimParams["regionhandle"] = theUser.CurrentAgent.currentHandle.ToString();
66	SimParams["caps_path"] = capsPath;	66	SimParams["caps_path"] = capsPath;
67	ArrayList SendParams = new ArrayList();	67	ArrayList SendParams = new ArrayList();
68	SendParams.Add(SimParams);	68	SendParams.Add(SimParams);
69		69
70	// Update agent with target sim	70	// Update agent with target sim
71	theUser.currentAgent.currentRegion = SimInfo.UUID;	71	theUser.CurrentAgent.currentRegion = SimInfo.UUID;
72	theUser.currentAgent.currentHandle = SimInfo.regionHandle;	72	theUser.CurrentAgent.currentHandle = SimInfo.regionHandle;
73		73
74	System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);	74	System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
75	// Send	75	// 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
83	Hashtable responseData = new Hashtable();	83	Hashtable responseData = new Hashtable();
84		84
85	// Account information	85	// Account information
86	responseData["firstname"] = profile.username;	86	responseData["firstname"] = profile.Firstname;
87	responseData["lastname"] = profile.surname;	87	responseData["lastname"] = profile.Lastname;
88	responseData["uuid"] = profile.UUID.ToStringHyphenated();	88	responseData["uuid"] = profile.UUID.ToStringHyphenated();
89	// Server Information	89	// Server Information
90	responseData["server_inventory"] = profile.userInventoryURI;	90	responseData["server_inventory"] = profile.UserInventoryUri;
91	responseData["server_asset"] = profile.userAssetURI;	91	responseData["server_asset"] = profile.UserAssetUri;
92	// Profile Information	92	// Profile Information
93	responseData["profile_about"] = profile.profileAboutText;	93	responseData["profile_about"] = profile.ProfileAboutText;
94	responseData["profile_firstlife_about"] = profile.profileFirstText;	94	responseData["profile_firstlife_about"] = profile.ProfileFirstText;
95	responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();	95	responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToStringHyphenated();
96	responseData["profile_can_do"] = profile.profileCanDoMask.ToString();	96	responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString();
97	responseData["profile_want_do"] = profile.profileWantDoMask.ToString();	97	responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString();
98	responseData["profile_image"] = profile.profileImage.ToStringHyphenated();	98	responseData["profile_image"] = profile.ProfileImage.ToStringHyphenated();
99	responseData["profile_created"] = profile.created.ToString();	99	responseData["profile_created"] = profile.Created.ToString();
100	responseData["profile_lastlogin"] = profile.lastLogin.ToString();	100	responseData["profile_lastlogin"] = profile.LastLogin.ToString();
101	// Home region information	101	// Home region information
102	responseData["home_coordinates_x"] = profile.homeLocation.X.ToString();	102	responseData["home_coordinates_x"] = profile.HomeLocation.X.ToString();
103	responseData["home_coordinates_y"] = profile.homeLocation.Y.ToString();	103	responseData["home_coordinates_y"] = profile.HomeLocation.Y.ToString();
104	responseData["home_coordinates_z"] = profile.homeLocation.Z.ToString();	104	responseData["home_coordinates_z"] = profile.HomeLocation.Z.ToString();
105		105
106	responseData["home_region"] = profile.homeRegion.ToString();	106	responseData["home_region"] = profile.HomeRegion.ToString();
107		107
108	responseData["home_look_x"] = profile.homeLookAt.X.ToString();	108	responseData["home_look_x"] = profile.HomeLookAt.X.ToString();
109	responseData["home_look_y"] = profile.homeLookAt.Y.ToString();	109	responseData["home_look_y"] = profile.HomeLookAt.Y.ToString();
110	responseData["home_look_z"] = profile.homeLookAt.Z.ToString();	110	responseData["home_look_z"] = profile.HomeLookAt.Z.ToString();
111	response.Value = responseData;	111	response.Value = responseData;
112		112
113	return response;	113	return response;