diff options
Deleted a few old files that are no longer used.
Deleted the GridInterfaces projects, and for now moved the old local asset server into Framework.Communications, as we prepare to rewrite the asset cache and asset server.
Deleted Framework.manager as I am sure this is no longer in use.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 955f179..ec660f3 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -231,7 +231,11 @@ namespace OpenSim | |||
231 | protected override void Initialize() | 231 | protected override void Initialize() |
232 | { | 232 | { |
233 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 233 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
234 | m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 234 | |
235 | LocalAssetServer assetServer = new LocalAssetServer(); | ||
236 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | ||
237 | m_assetCache = new AssetCache(assetServer); | ||
238 | // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | ||
235 | } | 239 | } |
236 | 240 | ||
237 | protected override LogBase CreateLog() | 241 | protected override LogBase CreateLog() |