moved fields to properties for UserDataProfile, which was

actually a little more work than I expected given the copious
use of out params.

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a91987f..e8c3f7c 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.UUID = 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.ProfileAboutText = Helpers.FieldToUTF8String(Properties.AboutText);
+                             UserProfile.ProfileFirstText = Helpers.FieldToUTF8String(Properties.FLAboutText);
+                             UserProfile.ProfileFirstImage = Properties.FLImageID;
+                             UserProfile.ProfileImage = Properties.ImageID;
 
                              handlerUpdateAvatarProperties(this, UserProfile);
                          }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 4dd58f2..e91cab5 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.UUID.ToString() + "]");
-                scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
+                m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.Id.ToString() + "]");
+                scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.Id;
             }
             else
             {