6 files changed, 32 insertions, 32 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e8c3f7c..939bd8f 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3100,11 +3100,11 @@ namespace OpenSim.Region.ClientStack
                          {
                              AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData;
                              UserProfileData UserProfile = new UserProfileData();
-                             UserProfile.Id = AgentId;
-                             UserProfile.ProfileAboutText = Helpers.FieldToUTF8String(Properties.AboutText);
-                             UserProfile.ProfileFirstText = Helpers.FieldToUTF8String(Properties.FLAboutText);
-                             UserProfile.ProfileFirstImage = Properties.FLImageID;
-                             UserProfile.ProfileImage = Properties.ImageID;
+                             UserProfile.ID = AgentId;
+                             UserProfile.AboutText = Helpers.FieldToUTF8String(Properties.AboutText);
+                             UserProfile.FirstLifeAboutText = Helpers.FieldToUTF8String(Properties.FLAboutText);
+                             UserProfile.FirstLifeImage = Properties.FLImageID;
+                             UserProfile.Image = Properties.ImageID;
 
                              handlerUpdateAvatarProperties(this, UserProfile);
                          }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index e91cab5..2b023a6 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -149,8 +149,8 @@ namespace OpenSim.Region.ClientStack
 
             if (masterAvatar != null)
             {
-                m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.Id.ToString() + "]");
-                scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.Id;
+                m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.ID.ToString() + "]");
+                scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
             }
             else
             {
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index d1d3e22..8895c6e 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Local
                 profile = m_userManager.GetUserProfile(firstname, lastname);
                 if (profile != null)
                 {
-                    m_Parent.InventoryService.CreateNewUserInventory(profile.Id);
+                    m_Parent.InventoryService.CreateNewUserInventory(profile.ID);
                 }
 
                 return profile;
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Communications.Local
 
                 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
 
-                response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.Id)); 
+                response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID)); 
 
                 Login _login = new Login();
                 //copy data to login object
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 00514e8..c543762 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Communications.Local
             }
             else
             {
-                m_inventoryService.CreateNewUserInventory(profile.Id);
+                m_inventoryService.CreateNewUserInventory(profile.ID);
             }
 
             return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 9796cf4..906101b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -62,15 +62,15 @@ namespace OpenSim.Region.Communications.OGS1
             UserProfileData userData = new UserProfileData();
             userData.FirstName = (string) data["firstname"];
             userData.SurName = (string) data["lastname"];
-            userData.Id = new LLUUID((string) data["uuid"]);
+            userData.ID = new LLUUID((string) data["uuid"]);
             userData.UserInventoryURI = (string) data["server_inventory"];
             userData.UserAssetURI = (string) data["server_asset"];
-            userData.ProfileFirstText = (string) data["profile_firstlife_about"];
-            userData.ProfileFirstImage = new LLUUID((string) data["profile_firstlife_image"]);
-            userData.ProfileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
-            userData.ProfileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
-            userData.ProfileAboutText = (string)data["profile_about"];
-            userData.ProfileImage = new LLUUID((string) data["profile_image"]);
+            userData.FirstLifeAboutText = (string) data["profile_firstlife_about"];
+            userData.FirstLifeImage = new LLUUID((string) data["profile_firstlife_image"]);
+            userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
+            userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
+            userData.AboutText = (string)data["profile_about"];
+            userData.Image = new LLUUID((string) data["profile_image"]);
             userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
             userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]);
             userData.HomeLocation =
@@ -306,13 +306,13 @@ namespace OpenSim.Region.Communications.OGS1
         {
             m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
             Hashtable param = new Hashtable();
-            param["avatar_uuid"] = UserProfile.Id.ToString();
+            param["avatar_uuid"] = UserProfile.ID.ToString();
             //param["AllowPublish"] = UserProfile.ToString();
-            param["FLImageID"] = UserProfile.ProfileFirstImage.ToString();
-            param["ImageID"] = UserProfile.ProfileImage.ToString();
+            param["FLImageID"] = UserProfile.FirstLifeImage.ToString();
+            param["ImageID"] = UserProfile.Image.ToString();
             //param["MaturePublish"] = MaturePublish.ToString();
-            param["AboutText"] = UserProfile.ProfileAboutText;
-            param["FLAboutText"] = UserProfile.ProfileFirstText;
+            param["AboutText"] = UserProfile.AboutText;
+            param["FLAboutText"] = UserProfile.FirstLifeAboutText;
             //param["ProfileURL"] = UserProfile.ProfileURL.ToString();
             IList parameters = new ArrayList();
             parameters.Add(param);
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 699e68d..e3ad297 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -90,10 +90,10 @@ namespace OpenSim.Region.Environment.Modules
             UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
             if (null != profile)
             {
-                remoteClient.SendAvatarProperties(profile.Id, profile.ProfileAboutText,
+                remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                     Util.ToDateTime(profile.Created).ToString(),
-                    System.String.Empty, profile.ProfileFirstText, profile.ProfileCanDoMask,
-                    profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner);
+                    System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
+                    profile.FirstLifeImage, profile.Image, System.String.Empty, partner);
             }
             else
             {
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Environment.Modules
 
         public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
         {
-            UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.Id);
+            UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
            
             // if it's the profile of the user requesting the update, then we change only a few things.
-            if (remoteClient.AgentId.CompareTo(Profile.Id) == 0)
+            if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
             {
-                Profile.ProfileImage = newProfile.ProfileImage;
-                Profile.ProfileFirstImage = newProfile.ProfileFirstImage;
-                Profile.ProfileAboutText = newProfile.ProfileAboutText;
-                Profile.ProfileFirstText = newProfile.ProfileFirstText;
+                Profile.Image = newProfile.Image;
+                Profile.FirstLifeImage = newProfile.FirstLifeImage;
+                Profile.AboutText = newProfile.AboutText;
+                Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
             }
             else
             {
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Modules
             }
             if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
             {
-                RequestAvatarProperty(remoteClient, newProfile.Id);
+                RequestAvatarProperty(remoteClient, newProfile.ID);
             }
         }
     }