diff options
author | Justin Clarke Casey | 2008-12-29 16:56:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-29 16:56:48 +0000 |
commit | 266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 (patch) | |
tree | 45f2ad93db485b5144c3fc86662891432c3a877a /OpenSim/Framework/IAssetLoader.cs | |
parent | Revamp the return logic to close a privilege escalation loophole. (diff) | |
download | opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.zip opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.gz opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.bz2 opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IAssetLoader.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/IAssetLoader.cs b/OpenSim/Framework/IAssetLoader.cs index 6aa71d3..3ecc051 100644 --- a/OpenSim/Framework/IAssetLoader.cs +++ b/OpenSim/Framework/IAssetLoader.cs | |||
@@ -31,7 +31,6 @@ namespace OpenSim.Framework | |||
31 | { | 31 | { |
32 | public interface IAssetLoader | 32 | public interface IAssetLoader |
33 | { | 33 | { |
34 | void ForEachDefaultXmlAsset(Action<AssetBase> action); | ||
35 | void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action); | 34 | void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action); |
36 | } | 35 | } |
37 | } \ No newline at end of file | 36 | } \ No newline at end of file |