1 files changed, 44 insertions, 18 deletions

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Services/InventoryService/LibraryService.cs
index 74ba0a5..383f311 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Services/InventoryService/LibraryService.cs
@@ -30,20 +30,32 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Xml;
+
+using OpenSim.Framework;
+using OpenSim.Services.Base;
+using OpenSim.Services.Interfaces;
+
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 
-namespace OpenSim.Framework.Communications.Cache
+namespace OpenSim.Services.InventoryService
 {
     /// <summary>
     /// Basically a hack to give us a Inventory library while we don't have a inventory server
     /// once the server is fully implemented then should read the data from that
     /// </summary>
-    public class LibraryRootFolder : InventoryFolderImpl
+    public class LibraryService : ServiceBase, ILibraryService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private InventoryFolderImpl m_LibraryRootFolder;
+
+        public InventoryFolderImpl LibraryRootFolder
+        {
+            get { return m_LibraryRootFolder; }
+        }
+
         private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000");
 
         /// <summary>
@@ -52,17 +64,31 @@ namespace OpenSim.Framework.Communications.Cache
         /// </summary>
         protected Dictionary<UUID, InventoryFolderImpl> libraryFolders
             = new Dictionary<UUID, InventoryFolderImpl>();
-        
-        public LibraryRootFolder(string pLibrariesLocation)
+
+        public LibraryService(IConfigSource config)
+            : base(config)
         {
-            Owner = libOwner;
-            ID = new UUID("00000112-000f-0000-0000-000100bba000");
-            Name = "OpenSim Library";
-            ParentID = UUID.Zero;
-            Type = (short) 8;
-            Version = (ushort) 1;
+            string pLibrariesLocation = Path.Combine("inventory", "Libraries.xml");
+            string pLibName = "OpenSim Library";
+
+            IConfig libConfig = config.Configs["LibraryService"];
+            if (libConfig != null)
+            {
+                pLibrariesLocation = libConfig.GetString("DefaultLibrary", pLibrariesLocation);
+                pLibName = libConfig.GetString("LibraryName", pLibName);
+            }
+
+            m_log.Debug("[LIBRARY]: Starting library service...");
+
+            m_LibraryRootFolder = new InventoryFolderImpl();
+            m_LibraryRootFolder.Owner = libOwner;
+            m_LibraryRootFolder.ID = new UUID("00000112-000f-0000-0000-000100bba000");
+            m_LibraryRootFolder.Name = pLibName;
+            m_LibraryRootFolder.ParentID = UUID.Zero;
+            m_LibraryRootFolder.Type = (short)8;
+            m_LibraryRootFolder.Version = (ushort)1;
 
-            libraryFolders.Add(ID, this);
+            libraryFolders.Add(m_LibraryRootFolder.ID, m_LibraryRootFolder);
 
             LoadLibraries(pLibrariesLocation);
         }
@@ -126,9 +152,9 @@ namespace OpenSim.Framework.Communications.Cache
         {
             InventoryFolderImpl folderInfo = new InventoryFolderImpl();
 
-            folderInfo.ID = new UUID(config.GetString("folderID", ID.ToString()));
+            folderInfo.ID = new UUID(config.GetString("folderID", m_LibraryRootFolder.ID.ToString()));
             folderInfo.Name = config.GetString("name", "unknown");
-            folderInfo.ParentID = new UUID(config.GetString("parentFolderID", ID.ToString()));
+            folderInfo.ParentID = new UUID(config.GetString("parentFolderID", m_LibraryRootFolder.ID.ToString()));
             folderInfo.Type = (short)config.GetInt("type", 8);
 
             folderInfo.Owner = libOwner;
@@ -160,9 +186,9 @@ namespace OpenSim.Framework.Communications.Cache
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = libOwner;
             item.CreatorId = libOwner.ToString();
-            item.ID = new UUID(config.GetString("inventoryID", ID.ToString()));
+            item.ID = new UUID(config.GetString("inventoryID", m_LibraryRootFolder.ID.ToString()));
             item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString()));
-            item.Folder = new UUID(config.GetString("folderID", ID.ToString()));
+            item.Folder = new UUID(config.GetString("folderID", m_LibraryRootFolder.ID.ToString()));
             item.Name = config.GetString("name", String.Empty);
             item.Description = config.GetString("description", item.Name);
             item.InvType = config.GetInt("inventoryType", 0);
@@ -230,11 +256,11 @@ namespace OpenSim.Framework.Communications.Cache
         /// methods in the superclass
         /// </summary>
         /// <returns></returns>
-        public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
+        public Dictionary<UUID, InventoryFolderImpl> GetAllFolders()
         {
             Dictionary<UUID, InventoryFolderImpl> fs = new Dictionary<UUID, InventoryFolderImpl>();
-            fs.Add(ID, this);
-            List<InventoryFolderImpl> fis = TraverseFolder(this);
+            fs.Add(m_LibraryRootFolder.ID, m_LibraryRootFolder);
+            List<InventoryFolderImpl> fis = TraverseFolder(m_LibraryRootFolder);
             foreach (InventoryFolderImpl f in fis)
             {
                 fs.Add(f.ID, f);