aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-29 16:56:48 +0000
committerJustin Clarke Casey2008-12-29 16:56:48 +0000
commit266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 (patch)
tree45f2ad93db485b5144c3fc86662891432c3a877a /OpenSim/Grid/AssetServer
parentRevamp the return logic to close a privilege escalation loophole. (diff)
downloadopensim-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 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 6d1028b..72300b5 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -87,8 +87,8 @@ namespace OpenSim.Grid.AssetServer
87 m_log.Info("[ASSET]: Setting up asset DB"); 87 m_log.Info("[ASSET]: Setting up asset DB");
88 setupDB(config); 88 setupDB(config);
89 89
90 m_log.Info("[ASSET]: Loading default asset set.."); 90 m_log.Info("[ASSET]: Loading default asset set from '" + config.AssetSetsLocation + "'");
91 LoadDefaultAssets(); 91 LoadDefaultAssets(config.AssetSetsLocation);
92 92
93 m_log.Info("[ASSET]: Starting HTTP process"); 93 m_log.Info("[ASSET]: Starting HTTP process");
94 m_httpServer = new BaseHttpServer(config.HttpPort); 94 m_httpServer = new BaseHttpServer(config.HttpPort);
@@ -142,9 +142,9 @@ namespace OpenSim.Grid.AssetServer
142 } 142 }
143 } 143 }
144 144
145 public void LoadDefaultAssets() 145 public void LoadDefaultAssets(string pAssetSetsLocation)
146 { 146 {
147 assetLoader.ForEachDefaultXmlAsset(StoreAsset); 147 assetLoader.ForEachDefaultXmlAsset(pAssetSetsLocation, StoreAsset);
148 } 148 }
149 149
150 protected void StoreAsset(AssetBase asset) 150 protected void StoreAsset(AssetBase asset)