further renaming of properties for clarity

2 files changed, 20 insertions, 20 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index e33468a..e327c46 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Data.MSSQL
 
             if (reader.Read())
             {
-                retval.Id = new LLUUID((string)reader["UUID"]);
+                retval.ID = new LLUUID((string)reader["UUID"]);
                 retval.FirstName = (string)reader["username"];
                 retval.SurName = (string)reader["lastname"];
 
@@ -323,14 +323,14 @@ namespace OpenSim.Data.MSSQL
                 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());
 
-                retval.ProfileAboutText = (string)reader["profileAboutText"];
-                retval.ProfileFirstText = (string)reader["profileFirstText"];
+                retval.AboutText = (string)reader["profileAboutText"];
+                retval.FirstLifeAboutText = (string)reader["profileFirstText"];
 
-                retval.ProfileImage = new LLUUID((string)reader["profileImage"]);
-                retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
+                retval.Image = new LLUUID((string)reader["profileImage"]);
+                retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
                 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
             }
             else
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index aae0095..3d4cabf 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Data.MSSQL
         override public UserAgentData GetAgentByName(string user, string last)
         {
             UserProfileData profile = GetUserByName(user, last);
-            return GetAgentByUUID(profile.Id);
+            return GetAgentByUUID(profile.ID);
         }
 
         /// <summary>
@@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
             {
                 lock (database)
                 {
-                    InsertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
+                    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)
@@ -651,7 +651,7 @@ namespace OpenSim.Data.MSSQL
                                                 "profileFirstImage = @profileFirstImage, " +
                                                 "webLoginKey = @webLoginKey  where " +
                                                 "UUID = @keyUUUID;", database.getConnection());
-            SqlParameter param1 = new SqlParameter("@uuid", user.Id.ToString());
+            SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
             SqlParameter param2 = new SqlParameter("@username", user.FirstName);
             SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
             SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
@@ -667,13 +667,13 @@ namespace OpenSim.Data.MSSQL
             SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
             SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
             SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
-            SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.ProfileCanDoMask));
-            SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask));
-            SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText);
-            SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText);
-            SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString());
-            SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString());
-            SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.ToString());
+            SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.CanDoMask));
+            SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
+            SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
+            SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
+            SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
+            SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
+            SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
             SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
             command.Parameters.Add(param1);
             command.Parameters.Add(param2);