3 files changed, 53 insertions, 215 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 75f0774..f54298c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -35,6 +35,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Serialization.External;
 
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
@@ -189,217 +190,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return Utils.StringToBytes(RewriteSOP(xml));
         }
 
-        protected void TransformXml(XmlReader reader, XmlWriter writer)
-        {
-//            m_log.DebugFormat("[HG ASSET MAPPER]: Transforming XML");
-
-            int sopDepth = -1;
-            UserAccount creator = null;
-            bool hasCreatorData = false;
-
-            while (reader.Read())
-            {
-//                Console.WriteLine("Depth: {0}, name {1}", reader.Depth, reader.Name);
-
-                switch (reader.NodeType)
-                {
-                    case XmlNodeType.Attribute:
-//                    Console.WriteLine("FOUND ATTRIBUTE {0}", reader.Name);
-                    writer.WriteAttributeString(reader.Prefix, reader.Name, reader.NamespaceURI, reader.Value);
-                    break;
-
-                    case XmlNodeType.CDATA:
-                    writer.WriteCData(reader.Value);
-                    break;
-
-                    case XmlNodeType.Comment:
-                    writer.WriteComment(reader.Value);
-                    break;
-
-                    case XmlNodeType.DocumentType:
-                    writer.WriteDocType(reader.Name, reader.Value, null, null);
-                    break;
-
-                    case XmlNodeType.Element: 
-//                    m_log.DebugFormat("Depth {0} at element {1}", reader.Depth, reader.Name);
-
-                    writer.WriteStartElement(reader.Prefix, reader.LocalName, reader.NamespaceURI);
-
-                    if (reader.HasAttributes)
-                    {
-                        while (reader.MoveToNextAttribute())
-                            writer.WriteAttributeString(reader.Prefix, reader.Name, reader.NamespaceURI, reader.Value);
-
-                        reader.MoveToElement();
-                    }
-
-                    if (reader.LocalName == "SceneObjectPart")
-                    {
-                        if (sopDepth < 0)
-                        {
-                            sopDepth = reader.Depth;
-//                            m_log.DebugFormat("[HG ASSET MAPPER]: Set sopDepth to {0}", sopDepth);
-                        }
-                    }
-                    else
-                    {
-                        if (sopDepth >= 0 && reader.Depth == sopDepth + 1)
-                        {
-                            if (reader.Name == "CreatorID")
-                            {
-                                reader.Read();
-                                if (reader.NodeType == XmlNodeType.Element && reader.Name == "Guid" || reader.Name == "UUID")
-                                {
-                                    reader.Read();
-
-                                    if (reader.NodeType == XmlNodeType.Text)
-                                    {
-                                        UUID uuid = UUID.Zero;
-                                        UUID.TryParse(reader.Value, out uuid);
-                                        creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
-                                        writer.WriteElementString("UUID", reader.Value);
-                                        reader.Read();
-                                    }
-                                    else
-                                    {
-                                        // If we unexpected run across mixed content in this node, still carry on
-                                        // transforming the subtree (this replicates earlier behaviour).
-                                        TransformXml(reader, writer);
-                                    }
-                                }
-                                else
-                                {
-                                    // If we unexpected run across mixed content in this node, still carry on
-                                    // transforming the subtree (this replicates earlier behaviour).
-                                    TransformXml(reader, writer);
-                                }
-                            }
-                            else if (reader.Name == "CreatorData")
-                            {
-                                reader.Read();
-                                if (reader.NodeType == XmlNodeType.Text)
-                                {
-                                    hasCreatorData = true;
-                                    writer.WriteString(reader.Value);
-                                }
-                                else
-                                {
-                                    // If we unexpected run across mixed content in this node, still carry on
-                                    // transforming the subtree (this replicates earlier behaviour).
-                                    TransformXml(reader, writer);
-                                }
-                            }
-                        }
-                    }
-                                        
-                    if (reader.IsEmptyElement)
-                    {
-//                        m_log.DebugFormat("[HG ASSET MAPPER]: Writing end for empty element {0}", reader.Name);
-                        writer.WriteEndElement();
-                    }
-
-                    break;
-
-                    case XmlNodeType.EndElement:
-//                    m_log.DebugFormat("Depth {0} at EndElement", reader.Depth);
-                    if (sopDepth == reader.Depth)
-                    {
-                        if (!hasCreatorData && creator != null)
-                            writer.WriteElementString(reader.Prefix, "CreatorData", reader.NamespaceURI, string.Format("{0};{1} {2}", m_HomeURI, creator.FirstName, creator.LastName));
-
-//                        m_log.DebugFormat("[HG ASSET MAPPER]: Reset sopDepth");
-                        sopDepth = -1;
-                        creator = null;
-                        hasCreatorData = false;
-                    }
-                    writer.WriteEndElement();
-                    break;
-
-                    case XmlNodeType.EntityReference:
-                    writer.WriteEntityRef(reader.Name);
-                    break;
-
-                    case XmlNodeType.ProcessingInstruction:
-                    writer.WriteProcessingInstruction(reader.Name, reader.Value);
-                    break;
-
-                    case XmlNodeType.Text:
-                    writer.WriteString(reader.Value);
-                    break;
-
-                    case XmlNodeType.XmlDeclaration:
-                    // For various reasons, not all serializations have xml declarations (or consistent ones) 
-                    // and as it's embedded inside a byte stream we don't need it anyway, so ignore.
-                    break;
-
-                    default:
-                    m_log.WarnFormat(
-                        "[HG ASSET MAPPER]: Unrecognized node {0} in asset XML transform in {1}", 
-                        reader.NodeType, m_scene.Name);
-                    break;
-                }
-            }
-        }
-
         protected string RewriteSOP(string xmlData)
         {
 //            Console.WriteLine("Input XML [{0}]", xmlData);
+            return ExternalRepresentationUtils.RewriteSOP(xmlData, m_scene.Name, m_HomeURI, m_scene.UserAccountService, m_scene.RegionInfo.ScopeID);
 
-            using (StringWriter sw = new StringWriter())
-            using (XmlTextWriter writer = new XmlTextWriter(sw))
-            using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
-            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
-            {
-                TransformXml(reader, writer);
-
-//                Console.WriteLine("Output: [{0}]", sw.ToString());
-
-                return sw.ToString();
-            }
-
-            // We are now taking the more complex streaming approach above because some assets can be very large
-            // and can trigger higher CPU use or possibly memory problems.
-//            XmlDocument doc = new XmlDocument();
-//            doc.LoadXml(xml);
-//            XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
-//
-//            foreach (XmlNode sop in sops)
-//            {
-//                UserAccount creator = null;
-//                bool hasCreatorData = false;
-//                XmlNodeList nodes = sop.ChildNodes;
-//                foreach (XmlNode node in nodes)
-//                {
-//                    if (node.Name == "CreatorID")
-//                    {
-//                        UUID uuid = UUID.Zero;
-//                        UUID.TryParse(node.InnerText, out uuid);
-//                        creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
-//                    }
-//                    if (node.Name == "CreatorData" && node.InnerText != null && node.InnerText != string.Empty)
-//                        hasCreatorData = true;
-//
-//                    //if (node.Name == "OwnerID")
-//                    //{
-//                    //    UserAccount owner = GetUser(node.InnerText);
-//                    //    if (owner != null)
-//                    //        node.InnerText = m_ProfileServiceURL + "/" + node.InnerText + "/" + owner.FirstName + " " + owner.LastName;
-//                    //}
-//                }
-//
-//                if (!hasCreatorData && creator != null)
-//                {
-//                    XmlElement creatorData = doc.CreateElement("CreatorData");
-//                    creatorData.InnerText = m_HomeURI + ";" + creator.FirstName + " " + creator.LastName;
-//                    sop.AppendChild(creatorData);
-//                }
-//            }
-//
-//            using (StringWriter wr = new StringWriter())
-//            {
-//                doc.Save(wr);
-//                return wr.ToString();
-//            }
         }
 
         // TODO: unused
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 01814a1..e657f53 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
         {
             InventoryFolderImpl folder = null;
             InventoryCollection inv = new InventoryCollection();
-            inv.UserID = m_Library.Owner;
+            inv.OwnerID = m_Library.Owner;
 
             if (folderID != m_Library.ID)
             {
@@ -87,6 +87,34 @@ namespace OpenSim.Region.CoreModules.Framework.Library
             return inv;
         }
 
+        public virtual InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderIDs)
+        {
+            InventoryCollection[] invColl = new InventoryCollection[folderIDs.Length];
+            int i = 0;
+            foreach (UUID fid in folderIDs)
+            {
+                invColl[i++] = GetFolderContent(principalID, fid);
+            }
+
+            return invColl;
+        }
+
+        public virtual InventoryItemBase[] GetMultipleItems(UUID principalID, UUID[] itemIDs)
+        {
+            InventoryItemBase[] itemColl = new InventoryItemBase[itemIDs.Length];
+            int i = 0;
+            InventoryItemBase item = new InventoryItemBase();
+            item.Owner = principalID;
+            foreach (UUID fid in itemIDs)
+            {
+                item.ID = fid;
+                itemColl[i++] = GetItem(item);
+            }
+
+            return itemColl;
+        }
+
+
         /// <summary>
         /// Add a new folder to the user's inventory
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index ba71dc5..7ecbd26 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion ISharedRegionModule
 
- 
+
         #region Event Handlers
 
         void EventManager_OnPrimsLoaded(Scene s)
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         void HandleUUIDNameRequest(UUID uuid, IClientAPI client)
         {
 //            m_log.DebugFormat(
-//                "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}", 
+//                "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}",
 //                uuid, remote_client.Name);
 
             if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     // appear to clear this when the user asks it to clear the cache, but others may not.
                     //
                     // So to avoid clients
-                    // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will 
+                    // (particularly Hypergrid clients) permanently binding "Unknown User" to a given UUID, we will
                     // instead drop the request entirely.
                     if (GetUser(uuid, out user))
                     {
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     }
 //                    else
 //                        m_log.DebugFormat(
-//                            "[USER MANAGEMENT MODULE]: No bound name for {0} found, ignoring request from {1}", 
+//                            "[USER MANAGEMENT MODULE]: No bound name for {0} found, ignoring request from {1}",
 //                            uuid, client.Name);
                 });
             }
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                     m_log.Debug("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e);
                     userdata.ServerURLs = new Dictionary<string, object>();
                 }
-                    
+
                 if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
                     return userdata.ServerURLs[serverType].ToString();
             }
@@ -620,7 +620,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 AddUser(id, string.Empty, string.Empty, string.Empty);
             }
             else
-            { 
+            {
                 string homeURL;
                 string firstname = string.Empty;
                 string lastname = string.Empty;
@@ -676,7 +676,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 else
                 {
                     lock(m_UserCache)
-                    { 
+                    {
                         if(!m_UserCache.ContainsKey(id))
                         {
                             UserData newUser = new UserData();
@@ -726,6 +726,21 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 "Show the bindings between user UUIDs and user names",
                 String.Empty,
                 HandleShowUsers);
+
+            MainConsole.Instance.Commands.AddCommand("Users", true,
+                "reset user cache",
+                "reset user cache",
+                "reset user cache to allow changed settings to be applied",
+                String.Empty,
+                HandleResetUserCache);
+        }
+
+        private void HandleResetUserCache(string module, string[] cmd)
+        {
+            lock(m_UserCache)
+            {
+                m_UserCache.Clear();
+            }
         }
 
         private void HandleShowUser(string module, string[] cmd)