diff options
author | diva | 2009-05-15 05:00:25 +0000 |
---|---|---|
committer | diva | 2009-05-15 05:00:25 +0000 |
commit | 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch) | |
tree | 497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Region/OptionalModules | |
parent | some sculpted prim geometry accuracy and meshing speed improvements (diff) | |
download | opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2 opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs index 0b937c1..963cab5 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs | |||
@@ -57,14 +57,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
57 | asset.Description = "MRM Image"; | 57 | asset.Description = "MRM Image"; |
58 | asset.Local = false; | 58 | asset.Local = false; |
59 | asset.Temporary = temporary; | 59 | asset.Temporary = temporary; |
60 | m_scene.CommsManager.AssetCache.AddAsset(asset); | 60 | m_scene.AssetService.Store(asset); |
61 | 61 | ||
62 | return asset.FullID; | 62 | return asset.FullID; |
63 | } | 63 | } |
64 | 64 | ||
65 | public Bitmap LoadBitmap(UUID assetID) | 65 | public Bitmap LoadBitmap(UUID assetID) |
66 | { | 66 | { |
67 | AssetBase bmp = m_scene.CommsManager.AssetCache.GetAsset(assetID, true); | 67 | AssetBase bmp = m_scene.AssetService.Get(assetID.ToString()); |
68 | ManagedImage outimg; | 68 | ManagedImage outimg; |
69 | Image img; | 69 | Image img; |
70 | OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img); | 70 | OpenJPEG.DecodeToImage(bmp.Data, out outimg, out img); |