ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
This commit is contained in:
Melanie
2010-02-08 15:53:20 +00:00
parent b18e95b3a2 70a0d7aa46
commit baaf660511
63 changed files with 5627 additions and 3494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library
{
m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message);
}
}
}
@@ -203,6 +202,14 @@ namespace OpenSim.Region.CoreModules.Framework.Library
m_log.DebugFormat(" - folder {0}", lib.Name);
DumpFolder(lib);
}
//
// private void DumpLibrary()
// {
// InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot;
//
// m_log.DebugFormat(" - folder {0}", lib.Name);
// DumpFolder(lib);
// }
private void DumpFolder(InventoryFolderImpl folder)
{