Merge branch 'master' into httptests

4 files changed, 24 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 15d31bd..8b8ebe0 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
         {
             
         }
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
index 5c791e6..eb2867d 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
@@ -268,8 +268,12 @@ namespace OpenSim.Region.DataSnapshot.Providers
                             {
                                 XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
                                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID);
-                                username.InnerText = account.FirstName + " " + account.LastName;
+                                if(account != null)
+                                    username.InnerText = account.FirstName + " " + account.LastName;
+                                else
+                                    username.InnerText = "UnKnown";
                                 userblock.AppendChild(username);
+
                             }
                             catch (Exception)
                             {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 1096eae..0cabe47 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -70,6 +70,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         private readonly UUID m_ownerID;
         private UUID m_hostGroupID;
         private string m_profileAbout = "";
+        private UUID m_profileImage = UUID.Zero;
+        private string m_born;
         public List<uint> SelectedObjects {get; private set;}
 
         public NPCAvatar(
@@ -109,6 +111,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     m_profileAbout = value;
             }
         }
+
+        public UUID profileImage
+        {
+            get { return m_profileImage; }
+            set { m_profileImage = value; }
+        }
+
         public IScene Scene
         {
             get { return m_scene; }
@@ -611,6 +620,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             set { }
         }
 
+        public string Born
+        {
+            get { return m_born; }
+            set { m_born = value; }
+        }
+
         public bool IsGroupMember(UUID groupID)
         {
             return (m_hostGroupID == groupID);
@@ -974,7 +989,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType,
                                          string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
                                          UUID partnerID)
         {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8462661..ced82e6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 AvatarAppearance appearance)
         {
             NPCAvatar npcAvatar = null;
+            string born = DateTime.UtcNow.ToString();
 
             try
             {
@@ -222,6 +223,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
                     {
+                        npcAvatar.Born = born;
                         npcAvatar.ActiveGroupId = groupID;
                         sp.CompleteMovement(npcAvatar, false);
                         sp.Grouptitle = groupTitle;