mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 17:32:42 +08:00
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
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using log4net;
|
||||
@@ -152,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
|
||||
TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
|
||||
m_textureSenders.Add(e.RequestedAssetID, requestHandler);
|
||||
|
||||
m_scene.CommsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
|
||||
m_scene.AssetService.Get(e.RequestedAssetID.ToString(), this, TextureReceived);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -168,6 +169,12 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
|
||||
}
|
||||
}
|
||||
|
||||
protected void TextureReceived(string id, Object sender, AssetBase asset)
|
||||
{
|
||||
if (asset != null)
|
||||
TextureCallback(asset.FullID, asset);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The callback for the asset cache when a texture has been retrieved. This method queues the
|
||||
/// texture sender for processing.
|
||||
|
||||
Reference in New Issue
Block a user