mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +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:
@@ -57,14 +57,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
|
||||
asset.Description = "MRM Image";
|
||||
asset.Local = false;
|
||||
asset.Temporary = temporary;
|
||||
m_scene.CommsManager.AssetCache.AddAsset(asset);
|
||||
m_scene.AssetService.Store(asset);
|
||||
|
||||
return asset.FullID;
|
||||
}
|
||||
|
||||
public Bitmap LoadBitmap(UUID assetID)
|
||||
{
|
||||
AssetBase bmp = m_scene.CommsManager.AssetCache.GetAsset(assetID, true);
|
||||
AssetBase bmp = m_scene.AssetService.Get(assetID.ToString());
|
||||
ManagedImage outimg;
|
||||
Image img;
|
||||
OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img);
|
||||
|
||||
Reference in New Issue
Block a user