ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Diva Canto
2010-01-01 21:12:46 -08:00
parent ec53301e63
commit 8a9677a531
13 changed files with 421 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
View File

@@ -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<ILibraryService>(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<ILibraryService>(m_Library);
}
public void RemoveRegion(Scene scene)
{
if (!m_Enabled)
return;
scene.UnregisterModuleInterface<ILibraryService>(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<IInventoryService>(invService);
m_MockScene.RegisterModuleInterface<IAssetService>(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);

4
OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
View File

@@ -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;
}

29
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -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<ILibraryService>();
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;