further renaming of properties for clarity

4 files changed, 22 insertions, 22 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;
                 }