diff options
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 8 |
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) |