further renaming of properties for clarity

5 files changed, 95 insertions, 95 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 75fe1aa..6e07e7c 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework.Communications.Cache
 //                    "[INVENTORY CACHE]: Received folder {0} {1} for user {2}", 
 //                    folderInfo.name, folderInfo.folderID, userID);
                 
-                if (userID == UserProfile.Id)
+                if (userID == UserProfile.ID)
                 {
                     if (RootFolder == null)
                     {
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <param name="folderInfo"></param>        
         public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
         {
-            if ((userID == UserProfile.Id) && (RootFolder != null))
+            if ((userID == UserProfile.ID) && (RootFolder != null))
             {
                 if (itemInfo.Folder == RootFolder.ID)
                 {
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
         {
-            if ((userID == UserProfile.Id) && (RootFolder != null))
+            if ((userID == UserProfile.ID) && (RootFolder != null))
             {
                 ItemReceive(userID, itemInfo);
                 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo)
         {
-            if ((userID == UserProfile.Id) && (RootFolder != null))
+            if ((userID == UserProfile.ID) && (RootFolder != null))
             {
                 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
             }
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Cache
         public bool DeleteItem(LLUUID userID, InventoryItemBase item)
         {
             bool result = false;
-            if ((userID == UserProfile.Id) && (RootFolder != null))
+            if ((userID == UserProfile.ID) && (RootFolder != null))
             {
                 result = RootFolder.DeleteItem(item.ID);
                 if (result)
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6b01d8f..192c8e3 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications
             }
             else
             {
-                m_inventoryService.CreateNewUserInventory(userProf.Id);
+                m_inventoryService.CreateNewUserInventory(userProf.ID);
                 m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
-                return userProf.Id;
+                return userProf.ID;
             }
         }
 
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Communications
                 UserProfileData profileData = m_userService.GetUserProfile(uuid);
                 if (profileData != null)
                 {
-                    LLUUID profileId = profileData.Id;
+                    LLUUID profileId = profileData.ID;
                     string firstname = profileData.FirstName;
                     string lastname = profileData.SurName;
 
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e5ad7a0..4f314bc 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.UserManagement
 
                     try
                     {
-                        LLUUID agentID = userProfile.Id;
+                        LLUUID agentID = userProfile.ID;
 
                         // Inventory Library Section
                         InventoryData inventData = GetInventorySkeleton(agentID);
@@ -349,7 +349,7 @@ namespace OpenSim.Framework.UserManagement
 
                     try
                     {
-                        LLUUID agentID = userProfile.Id;
+                        LLUUID agentID = userProfile.ID;
 
                         // Inventory Library Section
                         InventoryData inventData = GetInventorySkeleton(agentID);
@@ -491,7 +491,7 @@ namespace OpenSim.Framework.UserManagement
                 if (goodweblogin)
                 {
                     LLUUID webloginkey = LLUUID.Random();
-                    m_userManager.StoreWebLoginKey(user.Id, webloginkey);
+                    m_userManager.StoreWebLoginKey(user.ID, webloginkey);
                     statuscode = 301;
 
                     string redirectURL = "about:blank?redirect-http-hack=" +
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.UserManagement
         public virtual bool AuthenticateUser(UserProfileData profile, string password)
         {
             bool passwordSuccess = false;
-            m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id);
+            m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
 
             // Web Login method seems to also occasionally send the hashed password itself
 
@@ -664,7 +664,7 @@ namespace OpenSim.Framework.UserManagement
         public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey)
         {
             bool passwordSuccess = false;
-            m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id);
+            m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
 
             // Match web login key unless it's the default weblogin key LLUUID.Zero
             passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero);
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 02be6bd..91c284c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement
 
                 if (profile != null)
                 {
-                    profile.CurrentAgent = getUserAgent(profile.Id);
+                    profile.CurrentAgent = getUserAgent(profile.ID);
                     return profile;
                 }
             }
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.UserManagement
 
                 if (null != profile)
                 {
-                    profile.CurrentAgent = getUserAgent(profile.Id);
+                    profile.CurrentAgent = getUserAgent(profile.ID);
                     return profile;
                 }
             }
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.UserManagement
             agent.sessionID = new LLUUID(randDataS, 0);
 
             // Profile UUID
-            agent.UUID = profile.Id;
+            agent.UUID = profile.ID;
 
             // Current position (from Home)
             agent.currentHandle = profile.HomeRegion;
@@ -481,7 +481,7 @@ namespace OpenSim.Framework.UserManagement
             agent.sessionID = new LLUUID(randDataS, 0);
 
             // Profile UUID
-            agent.UUID = profile.Id;
+            agent.UUID = profile.ID;
 
             // Current position (from Home)
             agent.currentHandle = profile.HomeRegion;
@@ -523,7 +523,7 @@ namespace OpenSim.Framework.UserManagement
         {
             UserProfileData user = new UserProfileData();
             user.HomeLocation = new LLVector3(128, 128, 100);
-            user.Id = LLUUID.Random();
+            user.ID = LLUUID.Random();
             user.FirstName = firstName;
             user.SurName = lastName;
             user.PasswordHash = pass;
@@ -545,14 +545,14 @@ namespace OpenSim.Framework.UserManagement
                 }
             }
 
-            return user.Id;
+            return user.ID;
         }
 
         public bool UpdateUserProfileProperties(UserProfileData UserProfile)
         {
-            if (null == GetUserProfile(UserProfile.Id))
+            if (null == GetUserProfile(UserProfile.ID))
             {
-                m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.Id.ToString());
+                m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
                 return false;
             }
             foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -563,7 +563,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
-                    m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.Id.ToString()
+                    m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
                         + " via " + plugin.Key + "(" + e.ToString() + ")");
                     return false;
                 }
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 016dc8d..73c9137 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -43,42 +43,42 @@ namespace OpenSim.Framework
         /// <summary>
         /// The last used Web_login_key
         /// </summary>
-        private LLUUID webLoginKey;
+        private LLUUID _webLoginKey;
         /// <summary>
         /// The first component of a users account name
         /// </summary>
-        private string username;
+        private string _firstname;
 
         /// <summary>
         /// The second component of a users account name
         /// </summary>
-        private string surname;
+        private string _surname;
 
         /// <summary>
         /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
         /// </summary>
         /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
-        private string passwordHash;
+        private string _passwordHash;
 
         /// <summary>
         /// The salt used for the users hash, should be 32 bytes or longer
         /// </summary>
-        private string passwordSalt;
+        private string _passwordSalt;
 
         /// <summary>
         /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
         /// </summary>
         public ulong HomeRegion
         {
-            get { return Helpers.UIntsToLong((homeRegionX * (uint)Constants.RegionSize), (homeRegionY * (uint)Constants.RegionSize)); }
+            get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); }
             set
             {
-                homeRegionX = (uint) (value >> 40);
-                homeRegionY = (((uint) (value)) >> 8);
+                _homeRegionX = (uint) (value >> 40);
+                _homeRegionY = (((uint) (value)) >> 8);
             }
         }
 
-        public LLUUID Id {
+        public LLUUID ID {
             get {
                 return _id;
             }
@@ -89,261 +89,261 @@ namespace OpenSim.Framework
 
         public LLUUID WebLoginKey {
             get {
-                return webLoginKey;
+                return _webLoginKey;
             }
             set {
-                webLoginKey = value;
+                _webLoginKey = value;
             }
         }
 
         public string FirstName {
             get {
-                return username;
+                return _firstname;
             }
             set {
-                username = value;
+                _firstname = value;
             }
         }
 
         public string SurName {
             get {
-                return surname;
+                return _surname;
             }
             set {
-                surname = value;
+                _surname = value;
             }
         }
 
         public string PasswordHash {
             get {
-                return passwordHash;
+                return _passwordHash;
             }
             set {
-                passwordHash = value;
+                _passwordHash = value;
             }
         }
 
         public string PasswordSalt {
             get {
-                return passwordSalt;
+                return _passwordSalt;
             }
             set {
-                passwordSalt = value;
+                _passwordSalt = value;
             }
         }
 
         public uint HomeRegionX {
             get {
-                return homeRegionX;
+                return _homeRegionX;
             }
             set {
-                homeRegionX = value;
+                _homeRegionX = value;
             }
         }
 
         public uint HomeRegionY {
             get {
-                return homeRegionY;
+                return _homeRegionY;
             }
             set {
-                homeRegionY = value;
+                _homeRegionY = value;
             }
         }
 
         public LLVector3 HomeLocation {
             get {
-                return homeLocation;
+                return _homeLocation;
             }
             set {
-                homeLocation = value;
+                _homeLocation = value;
             }
         }
 
         public LLVector3 HomeLookAt {
             get {
-                return homeLookAt;
+                return _homeLookAt;
             }
             set {
-                homeLookAt = value;
+                _homeLookAt = value;
             }
         }
 
         public int Created {
             get {
-                return created;
+                return _created;
             }
             set {
-                created = value;
+                _created = value;
             }
         }
 
         public int LastLogin {
             get {
-                return lastLogin;
+                return _lastLogin;
             }
             set {
-                lastLogin = value;
+                _lastLogin = value;
             }
         }
 
         public LLUUID RootInventoryFolderID {
             get {
-                return rootInventoryFolderID;
+                return _rootInventoryFolderID;
             }
             set {
-                rootInventoryFolderID = value;
+                _rootInventoryFolderID = value;
             }
         }
 
         public string UserInventoryURI {
             get {
-                return userInventoryURI;
+                return _userInventoryURI;
             }
             set {
-                userInventoryURI = value;
+                _userInventoryURI = value;
             }
         }
 
         public string UserAssetURI {
             get {
-                return userAssetURI;
+                return _userAssetURI;
             }
             set {
-                userAssetURI = value;
+                _userAssetURI = value;
             }
         }
 
-        public uint ProfileCanDoMask {
+        public uint CanDoMask {
             get {
-                return profileCanDoMask;
+                return _profileCanDoMask;
             }
             set {
-                profileCanDoMask = value;
+                _profileCanDoMask = value;
             }
         }
 
-        public uint ProfileWantDoMask {
+        public uint WantDoMask {
             get {
-                return profileWantDoMask;
+                return _profileWantDoMask;
             }
             set {
-                profileWantDoMask = value;
+                _profileWantDoMask = value;
             }
         }
 
-        public string ProfileAboutText {
+        public string AboutText {
             get {
-                return profileAboutText;
+                return _profileAboutText;
             }
             set {
-                profileAboutText = value;
+                _profileAboutText = value;
             }
         }
 
-        public string ProfileFirstText {
+        public string FirstLifeAboutText {
             get {
-                return profileFirstText;
+                return _profileFirstText;
             }
             set {
-                profileFirstText = value;
+                _profileFirstText = value;
             }
         }
 
-        public LLUUID ProfileImage {
+        public LLUUID Image {
             get {
-                return profileImage;
+                return _profileImage;
             }
             set {
-                profileImage = value;
+                _profileImage = value;
             }
         }
 
-        public LLUUID ProfileFirstImage {
+        public LLUUID FirstLifeImage {
             get {
-                return profileFirstImage;
+                return _profileFirstImage;
             }
             set {
-                profileFirstImage = value;
+                _profileFirstImage = value;
             }
         }
 
         public UserAgentData CurrentAgent {
             get {
-                return currentAgent;
+                return _currentAgent;
             }
             set {
-                currentAgent = value;
+                _currentAgent = value;
             }
         }
 
-        private uint homeRegionX;
-        private uint homeRegionY;
+        private uint _homeRegionX;
+        private uint _homeRegionY;
 
         /// <summary>
         /// The coordinates inside the region of the home location
         /// </summary>
-        private LLVector3 homeLocation;
+        private LLVector3 _homeLocation;
 
         /// <summary>
         /// Where the user will be looking when they rez.
         /// </summary>
-        private LLVector3 homeLookAt;
+        private LLVector3 _homeLookAt;
 
         /// <summary>
         /// A UNIX Timestamp (seconds since epoch) for the users creation
         /// </summary>
-        private int created;
+        private int _created;
 
         /// <summary>
         /// A UNIX Timestamp for the users last login date / time
         /// </summary>
-        private int lastLogin;
+        private int _lastLogin;
 
-        private LLUUID rootInventoryFolderID;
+        private LLUUID _rootInventoryFolderID;
 
         /// <summary>
         /// A URI to the users inventory server, used for foreigners and large grids
         /// </summary>
-        private string userInventoryURI = String.Empty;
+        private string _userInventoryURI = String.Empty;
 
         /// <summary>
         /// A URI to the users asset server, used for foreigners and large grids.
         /// </summary>
-        private string userAssetURI = String.Empty;
+        private string _userAssetURI = String.Empty;
 
         /// <summary>
         /// A uint mask containing the "I can do" fields of the users profile
         /// </summary>
-        private uint profileCanDoMask;
+        private uint _profileCanDoMask;
 
         /// <summary>
         /// A uint mask containing the "I want to do" part of the users profile
         /// </summary>
-        private uint profileWantDoMask; // Profile window "I want to" mask
+        private uint _profileWantDoMask; // Profile window "I want to" mask
 
         /// <summary>
         /// The about text listed in a users profile.
         /// </summary>
-        private string profileAboutText = String.Empty;
+        private string _profileAboutText = String.Empty;
 
         /// <summary>
         /// The first life about text listed in a users profile
         /// </summary>
-        private string profileFirstText = String.Empty;
+        private string _profileFirstText = String.Empty;
 
         /// <summary>
         /// The profile image for an avatar stored on the asset server
         /// </summary>
-        private LLUUID profileImage;
+        private LLUUID _profileImage;
 
         /// <summary>
         /// The profile image for the users first life tab
         /// </summary>
-        private LLUUID profileFirstImage;
+        private LLUUID _profileFirstImage;
 
         /// <summary>
         /// The users last registered agent (filled in on the user server)
         /// </summary>
-        private UserAgentData currentAgent;
+        private UserAgentData _currentAgent;
     }
 }