17 files changed, 530 insertions, 68 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index dd2e859..6127c2d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -265,9 +265,10 @@ namespace OpenSim
                                           LoadOar);
 
             m_console.Commands.AddCommand("region", false, "save oar",
-                                          "save oar [-v|--version=N] [<OAR path>]",
+                                          "save oar [-v|--version=N] [-p|--profile=url] [<OAR path>]",
                                           "Save a region's data to an OAR archive.",
                                           "-v|--version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine
+                                          + "-p|--profile=url adds the url of the profile service to the saved user information" + Environment.NewLine
                                           + "The OAR path must be a filesystem path."
                                           + "  If this is not given then the oar is saved to region.oar in the current directory.",
                                           SaveOar);
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 25322a1..a5fcb49 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -115,10 +115,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
                         // Try to find the avatar wielding the killing object
                         killingAvatar = deadAvatar.Scene.GetScenePresence(part.OwnerID);
                         if (killingAvatar == null)
-                            deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, deadAvatar.Scene.GetUserName(part.OwnerID));
+                        {
+                            IUserManagement userManager = deadAvatar.Scene.RequestModuleInterface<IUserManagement>();
+                            string userName = "Unkown User";
+                            if (userManager != null)
+                                userName = userManager.GetUserName(part.OwnerID);
+                            deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, userName);
+                        }
                         else
                         {
-//                            killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name);
+                            //                            killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name);
                             deadAvatarMessage = String.Format("You got killed by {0}!", killingAvatar.Name);
                         }
                     }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index ef21834..67732ff 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -370,6 +370,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 item = new InventoryItemBase();
                 item.CreatorId = objectGroup.RootPart.CreatorID.ToString();
+                item.CreatorData = objectGroup.RootPart.CreatorData;
                 item.ID = UUID.Random();
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = folder.ID;
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
new file mode 100644
index 0000000..0d94baa
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+using OpenSim.Framework;
+
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Region.CoreModules.Framework.UserManagement
+{
+    struct UserData
+    {
+        public UUID Id;
+        public string FirstName;
+        public string LastName;
+        public string ProfileURL;
+    }
+
+    public class UserManagementModule : ISharedRegionModule, IUserManagement
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private List<Scene> m_Scenes = new List<Scene>();
+
+        // The cache
+        Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource config)
+        {
+            //m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled);
+            //if (m_Enabled)
+            //{
+            //    IConfig libConfig = config.Configs["LibraryService"];
+            //    if (libConfig != null)
+            //    {
+            //        string dllName = libConfig.GetString("LocalServiceModule", string.Empty);
+            //        m_log.Debug("[LIBRARY MODULE]: Library service dll is " + dllName);
+            //        if (dllName != string.Empty)
+            //        {
+            //            Object[] args = new Object[] { config };
+            //            m_Library = ServerUtils.LoadPlugin<ILibraryService>(dllName, args);
+            //        }
+            //    }
+            //}
+        }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
+        public string Name
+        {
+            get { return "UserManagement Module"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_Scenes.Add(scene);
+
+            scene.RegisterModuleInterface<IUserManagement>(this);
+            scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IUserManagement>(this);
+            m_Scenes.Remove(scene);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void PostInitialise()
+        {
+            foreach (Scene s in m_Scenes)
+            {
+                // let's sniff all the user names referenced by objects in the scene
+                m_log.DebugFormat("[USER MANAGEMENT MODULE]: Caching creators' data from {0} ({1} objects)...", s.RegionInfo.RegionName, s.GetEntities().Length);
+                s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); });
+            }
+        }
+
+        public void Close()
+        {
+            m_Scenes.Clear();
+            m_UserCache.Clear();
+        }
+
+        #endregion ISharedRegionModule
+
+ 
+        #region Event Handlers
+
+        void EventManager_OnNewClient(IClientAPI client)
+        {
+            client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest);
+        }
+
+        void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
+        {
+            if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
+            {
+                remote_client.SendNameReply(uuid, "Mr", "OpenSim");
+            }
+            else
+            {
+                string[] names = GetUserNames(uuid);
+                if (names.Length == 2)
+                {
+                    remote_client.SendNameReply(uuid, names[0], names[1]);
+                }
+
+            }
+        }
+
+        #endregion Event Handlers
+
+        private void CacheCreators(SceneObjectGroup sog)
+        {
+            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: processing {0} {1}; {2}", sog.RootPart.Name, sog.RootPart.CreatorData, sog.RootPart.CreatorIdentification);
+            AddUser(sog.RootPart.CreatorID, sog.RootPart.CreatorData);
+
+            foreach (SceneObjectPart sop in sog.Parts)
+            {
+                AddUser(sop.CreatorID, sop.CreatorData);
+                foreach (TaskInventoryItem item in sop.TaskInventory.Values)
+                    AddUser(item.CreatorID, item.CreatorData);
+            }
+        }
+
+
+        private string[] GetUserNames(UUID uuid)
+        {
+            string[] returnstring = new string[2];
+
+            if (m_UserCache.ContainsKey(uuid))
+            {
+                returnstring[0] = m_UserCache[uuid].FirstName;
+                returnstring[1] = m_UserCache[uuid].LastName;
+                return returnstring;
+            }
+
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);
+
+            if (account != null)
+            {
+                returnstring[0] = account.FirstName;
+                returnstring[1] = account.LastName;
+
+                UserData user = new UserData();
+                user.FirstName = account.FirstName;
+                user.LastName = account.LastName;
+
+                lock (m_UserCache)
+                    m_UserCache[uuid] = user;
+            }
+            else
+            {
+                returnstring[0] = "Unknown";
+                returnstring[1] = "User";
+            }
+
+            return returnstring;
+        }
+
+        #region IUserManagement
+
+        public string GetUserName(UUID uuid)
+        {
+            string[] names = GetUserNames(uuid);
+            if (names.Length == 2)
+            {
+                string firstname = names[0];
+                string lastname = names[1];
+
+                return firstname + " " + lastname;
+
+            }
+            return "(hippos)";
+        }
+
+        public void AddUser(UUID id, string creatorData)
+        {
+            if (m_UserCache.ContainsKey(id))
+                return;
+
+            UserData user = new UserData();
+            user.Id = id;
+
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
+
+            if (account != null)
+            {
+                user.FirstName = account.FirstName;
+                user.LastName = account.LastName;
+                // user.ProfileURL = we should initialize this to the default
+            }
+            else
+            {
+                if (creatorData != null && creatorData != string.Empty)
+                {
+                    //creatorData = <endpoint>;<name>
+
+                    string[] parts = creatorData.Split(';');
+                    if (parts.Length >= 1)
+                    {
+                        user.ProfileURL = parts[0];
+                        try
+                        {
+                            Uri uri = new Uri(parts[0]);
+                            user.LastName = "@" + uri.Authority;
+                        }
+                        catch
+                        {
+                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
+                            user.LastName = "@unknown";
+                        }
+                    }
+                    if (parts.Length >= 2)
+                        user.FirstName = parts[1].Replace(' ', '.');
+                }
+                else
+                {
+                    user.FirstName = "Unknown";
+                    user.LastName = "User";
+                }
+            }
+
+            lock (m_UserCache)
+                m_UserCache[id] = user;
+
+            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", user.Id, user.FirstName, user.LastName, user.ProfileURL);
+        }
+
+        //public void AddUser(UUID uuid, string userData)
+        //{
+        //    if (m_UserCache.ContainsKey(uuid))
+        //        return;
+
+        //    UserData user = new UserData();
+        //    user.Id = uuid;
+
+        //    // userData = <profile url>;<name>
+        //    string[] parts = userData.Split(';');
+        //    if (parts.Length >= 1)
+        //        user.ProfileURL = parts[0].Trim();
+        //    if (parts.Length >= 2)
+        //    {
+        //        string[] name = parts[1].Trim().Split(' ');
+        //        if (name.Length >= 1)
+        //            user.FirstName = name[0];
+        //        if (name.Length >= 2)
+        //            user.LastName = name[1];
+        //        else
+        //            user.LastName = "?";
+        //    }
+
+        //    lock (m_UserCache)
+        //        m_UserCache.Add(uuid, user);
+
+        //    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", user.Id, user.FirstName, user.LastName, user.ProfileURL);
+
+        //}
+
+        #endregion IUserManagement
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index df23eac..cfa4109 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -8,6 +8,7 @@
     </Dependencies>
 
     <Extension path = "/OpenSim/RegionModules">
+        <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
         <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
         <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
         <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index ab6be50..c7244c8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -49,6 +49,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private IInventoryService m_InventoryService;
 
+        private Scene m_Scene;
+
+        private IUserManagement m_UserManager;
+        private IUserManagement UserManager
+        {
+            get
+            {
+                if (m_UserManager == null)
+                {
+                    m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
+                }
+                return m_UserManager;
+            }
+        }
+
         private bool m_Enabled = false;
 
         public Type ReplaceableInterface 
@@ -115,6 +130,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return;
             
             scene.RegisterModuleInterface<IInventoryService>(this);
+
+            if (m_Scene == null)
+                m_Scene = scene;
         }
 
         public void RemoveRegion(Scene scene)
@@ -163,7 +181,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
-            return m_InventoryService.GetFolderContent(userID, folderID);
+            InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID);
+            if (UserManager != null)
+                foreach (InventoryItemBase item in invCol.Items)
+                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+
+            return invCol;
         }
 
         public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 17d80c7..9213132 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -47,9 +47,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private bool m_Enabled = false;
         private bool m_Initialized = false;
-//        private Scene m_Scene;
+        private Scene m_Scene;
         private InventoryServicesConnector m_RemoteConnector;
 
+        private IUserManagement m_UserManager;
+        private IUserManagement UserManager
+        {
+            get
+            {
+                if (m_UserManager == null)
+                {
+                    m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
+                }
+                return m_UserManager;
+            }
+        }
+
+
         public Type ReplaceableInterface 
         {
             get { return null; }
@@ -116,6 +130,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             scene.RegisterModuleInterface<IInventoryService>(this);
             m_cache.AddRegion(scene);
+
+            if (m_Scene == null)
+                m_Scene = scene;
         }
 
         public void RemoveRegion(Scene scene)
@@ -186,7 +203,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             UUID sessionID = GetSessionID(userID);
             try
             {
-                return m_RemoteConnector.GetFolderContent(userID.ToString(), folderID, sessionID);
+                InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID.ToString(), folderID, sessionID);
+                foreach (InventoryItemBase item in invCol.Items)
+                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+                return invCol;
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index d5d4468..3238a81 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -78,6 +78,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         private IDictionary<UUID, bool> m_validUserUuids = new Dictionary<UUID, bool>();
 
+        private IUserManagement m_UserMan;
+        private IUserManagement UserManager
+        {
+            get
+            {
+                if (m_UserMan == null)
+                {
+                    m_UserMan = m_scene.RequestModuleInterface<IUserManagement>();
+                }
+                return m_UserMan;
+            }
+        }
+
         public ArchiveReadRequest(Scene scene, string loadPath, bool merge, bool skipAssets, Guid requestId)
         {
             m_scene = scene;
@@ -251,8 +264,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 foreach (SceneObjectPart part in sceneObject.Parts)
                 {
-                    if (!ResolveUserUuid(part.CreatorID))
-                        part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    if (part.CreatorData == null || part.CreatorData == string.Empty)
+                    {
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    }
+                    if (UserManager != null)
+                        UserManager.AddUser(part.CreatorID, part.CreatorData);
 
                     if (!ResolveUserUuid(part.OwnerID))
                         part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -276,10 +294,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             {
                                 kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                             }
-                            if (!ResolveUserUuid(kvp.Value.CreatorID))
+                            if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
                             {
-                                kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                if (!ResolveUserUuid(kvp.Value.CreatorID))
+                                    kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                             }
+                            if (UserManager != null)
+                                UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData);
                         }
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index e0ad71e..358d0a7 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             OptionSet ops = new OptionSet();
             ops.Add("v|version=", delegate(string v) { options["version"] = v; });
+            ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 6844c60..622fc08 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -771,8 +771,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
             for (int i = 0; i < uuidarr.Length; i++)
             {
                 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
-                m_scene.GetUserName(uuidarr[i]);
+
+                IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>();
+                string userName = "Unkown User";
+                if (userManager != null)
+                    userName = userManager.GetUserName(uuidarr[i]);
+                
                 // we drop it.  It gets cached though...  so we're ready for the next request.
+                // diva commnent 11/21/2010: uh?!? wft?
             }
         }
         #endregion
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index c06ccb2..568ba19 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -189,6 +189,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
 
                 InventoryItemBase item = new InventoryItemBase();
                 item.CreatorId = part.CreatorID.ToString();
+                item.CreatorData = part.CreatorData;
 
                 item.ID = UUID.Random();
                 item.Owner = remoteClient.AgentId;
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
new file mode 100644
index 0000000..1a5cb7e
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+using OpenMetaverse;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IUserManagement
+    {
+        string GetUserName(UUID uuid);
+        void AddUser(UUID uuid, string userData);
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4cc797b..a29b7f1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -426,6 +426,7 @@ namespace OpenSim.Region.Framework.Scenes
                 InventoryItemBase itemCopy = new InventoryItemBase();
                 itemCopy.Owner = recipient;
                 itemCopy.CreatorId = item.CreatorId;
+                itemCopy.CreatorData = item.CreatorData;
                 itemCopy.ID = UUID.Random();
                 itemCopy.AssetID = item.AssetID;
                 itemCopy.Description = item.Description;
@@ -699,13 +700,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (remoteClient.AgentId == oldAgentID)
                 {
                     CreateNewInventoryItem(
-                        remoteClient, item.CreatorId, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
+                        remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
                         item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
                 }
                 else
                 {
                     CreateNewInventoryItem(
-                        remoteClient, item.CreatorId, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
+                        remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
                         item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
                 }
             }
@@ -755,11 +756,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="asset"></param>
         /// <param name="invType"></param>
         /// <param name="nextOwnerMask"></param>
-        private void CreateNewInventoryItem(IClientAPI remoteClient, string creatorID, UUID folderID, string name, uint flags, uint callbackID,
+        private void CreateNewInventoryItem(IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, string name, uint flags, uint callbackID,
                                             AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate)
         {
             CreateNewInventoryItem(
-                remoteClient, creatorID, folderID, name, flags, callbackID, asset, invType,
+                remoteClient, creatorID, creatorData, folderID, name, flags, callbackID, asset, invType,
                 (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate);
         }
 
@@ -774,12 +775,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="nextOwnerMask"></param>
         /// <param name="creationDate"></param>
         private void CreateNewInventoryItem(
-            IClientAPI remoteClient, string creatorID, UUID folderID, string name, uint flags, uint callbackID, AssetBase asset, sbyte invType,
+            IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, string name, uint flags, uint callbackID, AssetBase asset, sbyte invType,
             uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
         {
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = remoteClient.AgentId;
             item.CreatorId = creatorID;
+            item.CreatorData = creatorData;
             item.ID = UUID.Random();
             item.AssetID = asset.FullID;
             item.Description = asset.Description;
@@ -859,7 +861,7 @@ namespace OpenSim.Region.Framework.Scenes
                     AssetBase asset = CreateAsset(name, description, assetType, data, remoteClient.AgentId);
                     AssetService.Store(asset);
 
-                    CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
+                    CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
                 }
                 else
                 {
@@ -901,7 +903,7 @@ namespace OpenSim.Region.Framework.Scenes
                 asset.Description = description;
                 
                 CreateNewInventoryItem(
-                    remoteClient, remoteClient.AgentId.ToString(), folderID, name, 0, callbackID, asset, invType, 
+                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType, 
                     (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, 
                     (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch());
             }
@@ -1025,6 +1027,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             agentItem.ID = UUID.Random();
             agentItem.CreatorId = taskItem.CreatorID.ToString();
+            agentItem.CreatorData = taskItem.CreatorData;
             agentItem.Owner = destAgent;
             agentItem.AssetID = taskItem.AssetID;
             agentItem.Description = taskItem.Description;
@@ -1226,6 +1229,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             destTaskItem.ItemID = UUID.Random();
             destTaskItem.CreatorID = srcTaskItem.CreatorID;
+            destTaskItem.CreatorData = srcTaskItem.CreatorData;
             destTaskItem.AssetID = srcTaskItem.AssetID;
             destTaskItem.GroupID = destPart.GroupID;
             destTaskItem.OwnerID = destPart.OwnerID;
@@ -1638,6 +1642,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             destTaskItem.ItemID = UUID.Random();
             destTaskItem.CreatorID = srcTaskItem.CreatorID;
+            destTaskItem.CreatorData = srcTaskItem.CreatorData;
             destTaskItem.AssetID = srcTaskItem.AssetID;
             destTaskItem.GroupID = destPart.GroupID;
             destTaskItem.OwnerID = destPart.OwnerID;
@@ -1844,6 +1849,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 InventoryItemBase item = new InventoryItemBase();
                 item.CreatorId = grp.RootPart.CreatorID.ToString();
+                item.CreatorData = grp.RootPart.CreatorData;
                 item.Owner = remoteClient.AgentId;
                 item.ID = UUID.Random();
                 item.AssetID = asset.FullID;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 21c36d3..ab567fb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -462,22 +462,6 @@ namespace OpenSim.Region.Framework.Scenes
             );
         }
 
-        public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
-        {
-            if (LibraryService != null && (LibraryService.LibraryRootFolder.Owner == uuid))
-            {
-                remote_client.SendNameReply(uuid, "Mr", "OpenSim");
-            }
-            else
-            {
-                string[] names = GetUserNames(uuid);
-                if (names.Length == 2)
-                {
-                    remote_client.SendNameReply(uuid, names[0], names[1]);
-                }
-
-            }
-        }
 
         /// <summary>
         /// Handle a fetch inventory request from the client
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 96a9f99..4fc2cbc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -185,6 +185,8 @@ namespace OpenSim.Region.Framework.Scenes
         private Timer m_mapGenerationTimer = new Timer();
         private bool m_generateMaptiles;
 
+        private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>();
+
         #endregion Fields
 
         #region Properties
@@ -792,36 +794,6 @@ namespace OpenSim.Region.Framework.Scenes
             return m_simulatorVersion;
         }
 
-        public string[] GetUserNames(UUID uuid)
-        {
-            string[] returnstring = new string[0];
-
-            UserAccount account = UserAccountService.GetUserAccount(RegionInfo.ScopeID, uuid);
-
-            if (account != null)
-            {
-                returnstring = new string[2];
-                returnstring[0] = account.FirstName;
-                returnstring[1] = account.LastName;
-            }
-
-            return returnstring;
-        }
-
-        public string GetUserName(UUID uuid)
-        {
-            string[] names = GetUserNames(uuid);
-            if (names.Length == 2)
-            {
-                string firstname = names[0];
-                string lastname = names[1];
-
-                return firstname + " " + lastname;
-
-            }
-            return "(hippos)";
-        }
-
         /// <summary>
         /// Another region is up. 
         ///
@@ -2808,7 +2780,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void SubscribeToClientGridEvents(IClientAPI client)
         {
-            client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
+            //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
             client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
             client.OnSetStartLocationRequest += SetHomeRezPoint;
@@ -2935,7 +2907,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void UnSubscribeToClientGridEvents(IClientAPI client)
         {
-            client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
+            //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
             client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
             client.OnAvatarPickerRequest -= ProcessAvatarPickerRequest;
             client.OnSetStartLocationRequest -= SetHomeRezPoint;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f164201..2155e26 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -435,6 +435,7 @@ namespace OpenSim.Region.Framework.Scenes
         private DateTime m_expires;
         private DateTime m_rezzed;
         private bool m_createSelected = false;
+        private string m_creatorData = string.Empty;
 
         public UUID CreatorID 
         {
@@ -448,6 +449,61 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public string CreatorData // = <profile url>;<name>
+        {
+            get { return m_creatorData; }
+            set { m_creatorData = value; }
+        }
+
+        /// <summary>
+        /// Used by the DB layer to retrieve / store the entire user identification.
+        /// The identification can either be a simple UUID or a string of the form
+        /// uuid[;profile_url[;name]]
+        /// </summary>
+        public string CreatorIdentification
+        {
+            get
+            {
+                if (m_creatorData != null && m_creatorData != string.Empty)
+                    return _creatorID.ToString() + ';' + m_creatorData;
+                else
+                    return _creatorID.ToString();
+            }
+            set
+            {
+                if ((value == null) || (value != null && value == string.Empty))
+                {
+                    m_creatorData = string.Empty;
+                    return;
+                }
+
+                if (!value.Contains(";")) // plain UUID
+                {
+                    UUID uuid = UUID.Zero;
+                    UUID.TryParse(value, out uuid);
+                    _creatorID = uuid;
+                }
+                else // <uuid>[;<endpoint>[;name]]
+                {
+                    string name = "Unknown User";
+                    string[] parts = value.Split(';');
+                    if (parts.Length >= 1)
+                    {
+                        UUID uuid = UUID.Zero;
+                        UUID.TryParse(parts[0], out uuid);
+                        _creatorID = uuid;
+                    }
+                    if (parts.Length >= 2)
+                        m_creatorData = parts[1];
+                    if (parts.Length >= 3)
+                        name = parts[2];
+
+                    m_creatorData += ';' + name;
+                    
+                }
+            }
+        }
+
         /// <summary>
         /// A relic from when we we thought that prims contained folder objects. In 
         /// reality, prim == folder
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index fb4ef28..9cf5a39 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -34,6 +34,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Scenes.Serialization
@@ -46,6 +47,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
     public class SceneObjectSerializer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static IUserManagement m_UserManagement;
         
         /// <summary>
         /// Deserialize a scene object from the original xml format
@@ -270,6 +273,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             #region SOPXmlProcessors initialization
             m_SOPXmlProcessors.Add("AllowedDrop", ProcessAllowedDrop);
             m_SOPXmlProcessors.Add("CreatorID", ProcessCreatorID);
+            m_SOPXmlProcessors.Add("CreatorData", ProcessCreatorData);
             m_SOPXmlProcessors.Add("FolderID", ProcessFolderID);
             m_SOPXmlProcessors.Add("InventorySerial", ProcessInventorySerial);
             m_SOPXmlProcessors.Add("TaskInventory", ProcessTaskInventory);
@@ -327,6 +331,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_TaskInventoryXmlProcessors.Add("BasePermissions", ProcessTIBasePermissions);
             m_TaskInventoryXmlProcessors.Add("CreationDate", ProcessTICreationDate);
             m_TaskInventoryXmlProcessors.Add("CreatorID", ProcessTICreatorID);
+            m_TaskInventoryXmlProcessors.Add("CreatorData", ProcessTICreatorData);
             m_TaskInventoryXmlProcessors.Add("Description", ProcessTIDescription);
             m_TaskInventoryXmlProcessors.Add("EveryonePermissions", ProcessTIEveryonePermissions);
             m_TaskInventoryXmlProcessors.Add("Flags", ProcessTIFlags);
@@ -412,6 +417,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.CreatorID = ReadUUID(reader, "CreatorID");
         }
 
+        private static void ProcessCreatorData(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
+        }
+
         private static void ProcessFolderID(SceneObjectPart obj, XmlTextReader reader)
         {
             obj.FolderID = ReadUUID(reader, "FolderID");
@@ -698,6 +708,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             item.CreatorID = ReadUUID(reader, "CreatorID");
         }
 
+        private static void ProcessTICreatorData(TaskInventoryItem item, XmlTextReader reader)
+        {
+            item.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
+        }
+
         private static void ProcessTIDescription(TaskInventoryItem item, XmlTextReader reader)
         {
             item.Description = reader.ReadElementContentAsString("Description", String.Empty);
@@ -1077,11 +1092,23 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteAttributeString("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
 
             writer.WriteElementString("AllowedDrop", sop.AllowedDrop.ToString().ToLower());
+
             WriteUUID(writer, "CreatorID", sop.CreatorID, options);
+
+            if (sop.CreatorData != null && sop.CreatorData != string.Empty)
+                writer.WriteElementString("CreatorData", sop.CreatorData);
+            else if (options.ContainsKey("profile"))
+            {
+                if (m_UserManagement == null)
+                    m_UserManagement = sop.ParentGroup.Scene.RequestModuleInterface<IUserManagement>();
+                string name = m_UserManagement.GetUserName(sop.CreatorID);
+                writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + sop.CreatorID + ";" + name);
+            }
+
             WriteUUID(writer, "FolderID", sop.FolderID, options);
             writer.WriteElementString("InventorySerial", sop.InventorySerial.ToString());
 
-            WriteTaskInventory(writer, sop.TaskInventory, options);
+            WriteTaskInventory(writer, sop.TaskInventory, options, sop.ParentGroup.Scene);
 
             WriteUUID(writer, "UUID", sop.UUID, options);
             writer.WriteElementString("LocalId", sop.LocalId.ToString());
@@ -1205,7 +1232,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString(name, flagsStr);
         }
 
-        static void WriteTaskInventory(XmlTextWriter writer, TaskInventoryDictionary tinv, Dictionary<string, object> options)
+        static void WriteTaskInventory(XmlTextWriter writer, TaskInventoryDictionary tinv, Dictionary<string, object> options, Scene scene)
         {
             if (tinv.Count > 0) // otherwise skip this
             {
@@ -1218,7 +1245,20 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     WriteUUID(writer, "AssetID", item.AssetID, options);
                     writer.WriteElementString("BasePermissions", item.BasePermissions.ToString());
                     writer.WriteElementString("CreationDate", item.CreationDate.ToString());
+
+                    
                     WriteUUID(writer, "CreatorID", item.CreatorID, options);
+
+                    if (item.CreatorData != null && item.CreatorData != string.Empty)
+                        writer.WriteElementString("CreatorData", item.CreatorData);
+                    else if (options.ContainsKey("profile"))
+                    {
+                        if (m_UserManagement == null)
+                            m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
+                        string name = m_UserManagement.GetUserName(item.CreatorID);
+                        writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + item.CreatorID + ";" + name);
+                    }
+
                     writer.WriteElementString("Description", item.Description);
                     writer.WriteElementString("EveryonePermissions", item.EveryonePermissions.ToString());
                     writer.WriteElementString("Flags", item.Flags.ToString());