further renaming of properties for clarity

2 files changed, 19 insertions, 19 deletions

diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 110f192..f4ef172 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -431,7 +431,7 @@ namespace OpenSim.Data.MySQL
                 if (!LLUUID.TryParse((string)reader["UUID"], out id))
                     return null;
 
-                retval.Id = id;
+                retval.ID = id;
                 retval.FirstName = (string) reader["username"];
                 retval.SurName = (string) reader["lastname"];
 
@@ -454,33 +454,33 @@ namespace OpenSim.Data.MySQL
                 retval.UserInventoryURI = (string) reader["userInventoryURI"];
                 retval.UserAssetURI = (string) reader["userAssetURI"];
 
-                retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
-                retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
+                retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
+                retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
-                    retval.ProfileAboutText = "";
+                    retval.AboutText = "";
                 else 
-                    retval.ProfileAboutText = (string) reader["profileAboutText"];
+                    retval.AboutText = (string) reader["profileAboutText"];
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
-                    retval.ProfileFirstText = "";
+                    retval.FirstLifeAboutText = "";
                 else
-                    retval.ProfileFirstText = (string)reader["profileFirstText"];
+                    retval.FirstLifeAboutText = (string)reader["profileFirstText"];
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
-                    retval.ProfileImage = LLUUID.Zero;
+                    retval.Image = LLUUID.Zero;
                 else {
                     LLUUID tmp;
                     LLUUID.TryParse((string)reader["profileImage"], out tmp);
-                    retval.ProfileImage = tmp;
+                    retval.Image = tmp;
                 }
 
                 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
-                    retval.ProfileFirstImage = LLUUID.Zero;
+                    retval.FirstLifeImage = LLUUID.Zero;
                 else {
                     LLUUID tmp;
                     LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
-                    retval.ProfileFirstImage = tmp;
+                    retval.FirstLifeImage = tmp;
                 }
                 
                 if(reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 5654207..5b2dc76 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
         override public UserAgentData GetAgentByName(string user, string last)
         {
             UserProfileData profile = GetUserByName(user, last);
-            return GetAgentByUUID(profile.Id);
+            return GetAgentByUUID(profile.ID);
         }
 
         override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
@@ -547,14 +547,14 @@ namespace OpenSim.Data.MySQL
             {
                 lock (database)
                 {
-                    database.insertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
+                    database.insertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
                                            user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
                                            user.HomeLocation.Z,
                                            user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
                                            user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
-                                           user.ProfileCanDoMask, user.ProfileWantDoMask,
-                                           user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage,
-                                           user.ProfileFirstImage, user.WebLoginKey);
+                                           user.CanDoMask, user.WantDoMask,
+                                           user.AboutText, user.FirstLifeAboutText, user.Image,
+                                           user.FirstLifeImage, user.WebLoginKey);
                 }
             }
             catch (Exception e)
@@ -590,11 +590,11 @@ namespace OpenSim.Data.MySQL
         /// <param name="user">The profile data to use to update the DB</param>
         override public bool UpdateUserProfile(UserProfileData user)
         {
-            database.updateUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
+            database.updateUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
                                    user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X,
                                    user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI,
-                                   user.UserAssetURI, user.ProfileCanDoMask, user.ProfileWantDoMask, user.ProfileAboutText,
-                                   user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage, user.WebLoginKey);
+                                   user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
+                                   user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey);
             return true;
         }