ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +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

12
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -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)