From 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d Mon Sep 17 00:00:00 2001 From: diva Date: Fri, 15 May 2009 05:00:25 +0000 Subject: Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only. This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing. Known problems: * HG asset transfers are borked for now * missing texture is missing * 3 unit tests commented out for now --- OpenSim/Client/Linden/LLClientStackModule.cs | 2 +- OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Client') diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs index 4639db8..461c651 100644 --- a/OpenSim/Client/Linden/LLClientStackModule.cs +++ b/OpenSim/Client/Linden/LLClientStackModule.cs @@ -83,7 +83,7 @@ namespace OpenSim.Client.Linden m_clientServer = m_clientStackManager.CreateServer(endPoint.Address, ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source, - m_scene.CommsManager.AssetCache, m_scene.AuthenticateHandler); + m_scene.AuthenticateHandler); m_clientServer.AddScene(m_scene); diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 167d081..4218ad7 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs @@ -88,7 +88,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack if (!UUID.TryParse(param, out assetID)) return false; - AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(assetID, true); + AssetBase asset = m_scene.AssetService.Get(assetID.ToString()); if (asset == null) return false; -- cgit v1.1