From 8a9677a5319793ff630d0761e204ae8961f375aa Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 1 Jan 2010 21:12:46 -0800 Subject: The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible. --- .../Region/ClientStack/LindenUDP/LLClientView.cs | 4 ++- .../CoreModules/Framework/Library/LibraryModule.cs | 33 ++++++++++++++++----- .../Framework/Library/LocalInventoryService.cs | 4 +-- .../World/Permissions/PermissionsModule.cs | 29 ++++++++++++++---- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 12 ++++---- .../Framework/Scenes/Scene.PacketHandlers.cs | 34 ++++++++++++---------- OpenSim/Region/Framework/Scenes/Scene.cs | 13 +++++++++ 7 files changed, 92 insertions(+), 37 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0ec2ed5..25026a6 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -6962,7 +6962,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP assetRequestItem = invService.GetItem(assetRequestItem); if (assetRequestItem == null) { - assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); + ILibraryService lib = m_scene.RequestModuleInterface(); + if (lib != null) + assetRequestItem = lib.LibraryRootFolder.FindItem(itemID); if (assetRequestItem == null) return true; } diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 6941e00..f1022fd 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs @@ -37,6 +37,7 @@ using OpenSim.Region.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; +using OpenSim.Server.Base; using OpenMetaverse; using log4net; @@ -53,6 +54,8 @@ namespace OpenSim.Region.CoreModules.Framework.Library private string m_LibraryName = "OpenSim Library"; private Scene m_Scene; + private ILibraryService m_Library; + #region ISharedRegionModule public void Initialise(IConfigSource config) @@ -60,9 +63,22 @@ namespace OpenSim.Region.CoreModules.Framework.Library m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled); if (m_Enabled) { - IConfig libConfig = config.Configs["LibraryModule"]; + IConfig libConfig = config.Configs["LibraryService"]; if (libConfig != null) - m_LibraryName = libConfig.GetString("LibraryName", m_LibraryName); + { + 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(dllName, args); + } + } + } + if (m_Library == null) + { + m_log.Warn("[LIBRARY MODULE]: No local library service. Module will be disabled."); + m_Enabled = false; } } @@ -91,10 +107,15 @@ namespace OpenSim.Region.CoreModules.Framework.Library { m_Scene = scene; } + scene.RegisterModuleInterface(m_Library); } public void RemoveRegion(Scene scene) { + if (!m_Enabled) + return; + + scene.UnregisterModuleInterface(m_Library); } public void RegionLoaded(Scene scene) @@ -127,19 +148,17 @@ namespace OpenSim.Region.CoreModules.Framework.Library protected void LoadLibrariesFromArchives() { - InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot; + InventoryFolderImpl lib = m_Library.LibraryRootFolder; if (lib == null) { m_log.Debug("[LIBRARY MODULE]: No library. Ignoring Library Module"); return; } - lib.Name = m_LibraryName; - RegionInfo regInfo = new RegionInfo(); Scene m_MockScene = new Scene(regInfo); m_MockScene.CommsManager = m_Scene.CommsManager; - LocalInventoryService invService = new LocalInventoryService((LibraryRootFolder)lib); + LocalInventoryService invService = new LocalInventoryService(lib); m_MockScene.RegisterModuleInterface(invService); m_MockScene.RegisterModuleInterface(m_Scene.AssetService); @@ -181,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library private void DumpLibrary() { - InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot; + InventoryFolderImpl lib = m_Library.LibraryRootFolder; m_log.DebugFormat(" - folder {0}", lib.Name); DumpFolder(lib); diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 2c95b5a..685c031 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs @@ -41,9 +41,9 @@ namespace OpenSim.Region.CoreModules.Framework.Library { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private LibraryRootFolder m_Library; + private InventoryFolderImpl m_Library; - public LocalInventoryService(LibraryRootFolder lib) + public LocalInventoryService(InventoryFolderImpl lib) { m_Library = lib; } diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index c9b3071..91c0a53 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -95,6 +95,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions protected Scene m_scene; + private InventoryFolderImpl m_libraryRootFolder; + protected InventoryFolderImpl LibraryRootFolder + { + get + { + if (m_libraryRootFolder != null) + return m_libraryRootFolder; + + ILibraryService lib = m_scene.RequestModuleInterface(); + if (lib != null) + { + m_libraryRootFolder = lib.LibraryRootFolder; + } + return m_libraryRootFolder; + } + } + #region Constants // These are here for testing. They will be taken out @@ -1005,9 +1022,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions IInventoryService invService = m_scene.InventoryService; InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); assetRequestItem = invService.GetItem(assetRequestItem); - if (assetRequestItem == null) // Library item + if (assetRequestItem == null && LibraryRootFolder != null) // Library item { - assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); + assetRequestItem = LibraryRootFolder.FindItem(notecard); if (assetRequestItem != null) // Implicitly readable return true; @@ -1425,9 +1442,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions IInventoryService invService = m_scene.InventoryService; InventoryItemBase assetRequestItem = new InventoryItemBase(script, user); assetRequestItem = invService.GetItem(assetRequestItem); - if (assetRequestItem == null) // Library item + if (assetRequestItem == null && LibraryRootFolder != null) // Library item { - assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script); + assetRequestItem = LibraryRootFolder.FindItem(script); if (assetRequestItem != null) // Implicitly readable return true; @@ -1520,9 +1537,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions IInventoryService invService = m_scene.InventoryService; InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); assetRequestItem = invService.GetItem(assetRequestItem); - if (assetRequestItem == null) // Library item + if (assetRequestItem == null && LibraryRootFolder != null) // Library item { - assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); + assetRequestItem = LibraryRootFolder.FindItem(notecard); if (assetRequestItem != null) // Implicitly readable return true; diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 89ce4ae..f322af3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -573,7 +573,9 @@ namespace OpenSim.Region.Framework.Scenes "[AGENT INVENTORY]: CopyInventoryItem received by {0} with oldAgentID {1}, oldItemID {2}, new FolderID {3}, newName {4}", remoteClient.AgentId, oldAgentID, oldItemID, newFolderID, newName); - InventoryItemBase item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(oldItemID); + InventoryItemBase item = null; + if (LibraryService != null && LibraryService.LibraryRootFolder != null) + item = LibraryService.LibraryRootFolder.FindItem(oldItemID); if (item == null) { @@ -1211,9 +1213,9 @@ namespace OpenSim.Region.Framework.Scenes item = InventoryService.GetItem(item); // Try library - if (null == item) + if (null == item && LibraryService != null && LibraryService.LibraryRootFolder != null) { - item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); + item = LibraryService.LibraryRootFolder.FindItem(itemID); } if (item != null) @@ -1280,9 +1282,9 @@ namespace OpenSim.Region.Framework.Scenes // Try library // XXX clumsy, possibly should be one call - if (null == item) + if (null == item && LibraryService != null && LibraryService.LibraryRootFolder != null) { - item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); + item = LibraryService.LibraryRootFolder.FindItem(itemID); } if (item != null) diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 47fbeb4..022d79d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -424,7 +424,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID) { - if (ownerID == CommsManager.UserProfileCacheService.LibraryRoot.Owner) + if (LibraryService != null && LibraryService.LibraryRootFolder != null && ownerID == LibraryService.LibraryRootFolder.Owner) { //m_log.Debug("request info for library item"); return; @@ -458,13 +458,14 @@ namespace OpenSim.Region.Framework.Scenes // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. // can be handled transparently). InventoryFolderImpl fold = null; - if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) - { - remoteClient.SendInventoryFolderDetails( - fold.Owner, folderID, fold.RequestListOfItems(), - fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); - return; - } + if (LibraryService != null && LibraryService.LibraryRootFolder != null) + if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) + { + remoteClient.SendInventoryFolderDetails( + fold.Owner, folderID, fold.RequestListOfItems(), + fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); + return; + } // We're going to send the reply async, because there may be // an enormous quantity of packets -- basically the entire inventory! @@ -512,15 +513,16 @@ namespace OpenSim.Region.Framework.Scenes // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. // can be handled transparently). InventoryFolderImpl fold; - if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) - { - version = 0; - InventoryCollection ret = new InventoryCollection(); - ret.Folders = new List(); - ret.Items = fold.RequestListOfItems(); + if (LibraryService != null && LibraryService.LibraryRootFolder != null) + if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) + { + version = 0; + InventoryCollection ret = new InventoryCollection(); + ret.Folders = new List(); + ret.Items = fold.RequestListOfItems(); - return ret; - } + return ret; + } InventoryCollection contents = new InventoryCollection(); diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 418cfbf..ae189b5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -240,6 +240,19 @@ namespace OpenSim.Region.Framework.Scenes } } + protected ILibraryService m_LibraryService; + + public ILibraryService LibraryService + { + get + { + if (m_LibraryService == null) + m_LibraryService = RequestModuleInterface(); + + return m_LibraryService; + } + } + protected IXMLRPC m_xmlrpcModule; protected IWorldComm m_worldCommModule; protected IAvatarFactory m_AvatarFactory; -- cgit v1.1