diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Region/OptionalModules | |
parent | refactor out iar escaping (diff) | |
parent | remove the debug stuff (diff) | |
download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs index 963cab5..8ea7ad3 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs | |||
@@ -49,11 +49,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
49 | 49 | ||
50 | public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) | 50 | public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) |
51 | { | 51 | { |
52 | AssetBase asset = new AssetBase(); | 52 | AssetBase asset = new AssetBase(UUID.Random(), "MRMDynamicImage", (sbyte)AssetType.Texture); |
53 | asset.FullID = UUID.Random(); | ||
54 | asset.Data = OpenJPEG.EncodeFromImage(data, lossless); | 53 | asset.Data = OpenJPEG.EncodeFromImage(data, lossless); |
55 | asset.Name = "MRMDynamicImage"; | ||
56 | asset.Type = 0; | ||
57 | asset.Description = "MRM Image"; | 54 | asset.Description = "MRM Image"; |
58 | asset.Local = false; | 55 | asset.Local = false; |
59 | asset.Temporary = temporary; | 56 | asset.Temporary = temporary; |