From 25fea01b92a7682e10f57ce979217d31fee975ef Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 10 Apr 2008 14:09:30 +0000 Subject: further renaming of properties for clarity --- OpenSim/Grid/UserServer/UserLoginService.cs | 8 ++++---- OpenSim/Grid/UserServer/UserManager.cs | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index f655415..141aa3e 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -177,7 +177,7 @@ namespace OpenSim.Grid.UserServer SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); SimParams["firstname"] = theUser.FirstName; SimParams["lastname"] = theUser.SurName; - SimParams["agent_id"] = theUser.Id.ToString(); + SimParams["agent_id"] = theUser.ID.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(); @@ -206,7 +206,7 @@ namespace OpenSim.Grid.UserServer if (handlerUserLoggedInAtLocation != null) { m_log.Info("[LOGIN]: Letting other objects know about login"); - handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, + handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, theUser.FirstName,theUser.SurName); } @@ -268,7 +268,7 @@ namespace OpenSim.Grid.UserServer SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); SimParams["firstname"] = theUser.FirstName; SimParams["lastname"] = theUser.SurName; - SimParams["agent_id"] = theUser.Id.ToString(); + SimParams["agent_id"] = theUser.ID.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(); @@ -286,7 +286,7 @@ namespace OpenSim.Grid.UserServer if (handlerUserLoggedInAtLocation != null) { m_log.Info("[LOGIN]: Letting other objects know about login"); - handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, + handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, theUser.FirstName, theUser.SurName); } diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index cf05bfd..cf3f8d8 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs @@ -127,17 +127,17 @@ namespace OpenSim.Grid.UserServer // Account information responseData["firstname"] = profile.FirstName; responseData["lastname"] = profile.SurName; - responseData["uuid"] = profile.Id.ToString(); + responseData["uuid"] = profile.ID.ToString(); // Server Information 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.ToString(); - responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString(); - responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString(); - responseData["profile_image"] = profile.ProfileImage.ToString(); + responseData["profile_about"] = profile.AboutText; + responseData["profile_firstlife_about"] = profile.FirstLifeAboutText; + responseData["profile_firstlife_image"] = profile.FirstLifeImage.ToString(); + responseData["profile_can_do"] = profile.CanDoMask.ToString(); + responseData["profile_want_do"] = profile.WantDoMask.ToString(); + responseData["profile_image"] = profile.Image.ToString(); responseData["profile_created"] = profile.Created.ToString(); responseData["profile_lastlogin"] = profile.LastLogin.ToString(); // Home region information @@ -341,11 +341,11 @@ namespace OpenSim.Grid.UserServer } if (requestData.Contains("FLImageID")) { - userProfile.ProfileFirstImage = new LLUUID((string)requestData["FLImageID"]); + userProfile.FirstLifeImage = new LLUUID((string)requestData["FLImageID"]); } if (requestData.Contains("ImageID")) { - userProfile.ProfileImage = new LLUUID((string)requestData["ImageID"]); + userProfile.Image = new LLUUID((string)requestData["ImageID"]); } // dont' know how yet if (requestData.Contains("MaturePublish")) @@ -353,11 +353,11 @@ namespace OpenSim.Grid.UserServer } if (requestData.Contains("AboutText")) { - userProfile.ProfileAboutText = (string)requestData["AboutText"]; + userProfile.AboutText = (string)requestData["AboutText"]; } if (requestData.Contains("FLAboutText")) { - userProfile.ProfileFirstText = (string)requestData["FLAboutText"]; + userProfile.FirstLifeAboutText = (string)requestData["FLAboutText"]; } // not in DB yet. if (requestData.Contains("ProfileURL")) -- cgit v1.1