ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes

Browse Source 
* This allows configuration of the assetset and library control file paths to be other than ./inventory/Libraries.xml and ./assets/AssetSets.xml
* This is controlled via the LibrariesXMLFile and AssetSetsXMLFile configuration settings in [StandAlone] in OpenSim.ini (in standalone)
and via the user and asset config xml files for grid mode
* Thanks to SirKimba for the patch
This commit is contained in:
Justin Clarke Casey
2008-12-29 16:56:48 +00:00
parent 817a10d0aa
commit 266d0fbaae
12 changed files with 87 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Grid/AssetServer/Main.cs
View File

@@ -87,8 +87,8 @@ namespace OpenSim.Grid.AssetServer
m_log.Info("[ASSET]: Setting up asset DB");
setupDB(config);
m_log.Info("[ASSET]: Loading default asset set..");
LoadDefaultAssets();
m_log.Info("[ASSET]: Loading default asset set from '" + config.AssetSetsLocation + "'");
LoadDefaultAssets(config.AssetSetsLocation);
m_log.Info("[ASSET]: Starting HTTP process");
m_httpServer = new BaseHttpServer(config.HttpPort);
@@ -142,9 +142,9 @@ namespace OpenSim.Grid.AssetServer
}
}
public void LoadDefaultAssets()
public void LoadDefaultAssets(string pAssetSetsLocation)
{
assetLoader.ForEachDefaultXmlAsset(StoreAsset);
assetLoader.ForEachDefaultXmlAsset(pAssetSetsLocation, StoreAsset);
}
protected void StoreAsset(AssetBase asset)