Merge branch 'master' into vehicles

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
index b153997..856eb11 100644
--- a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
@@ -30,12 +30,11 @@ using OpenMetaverse.Imaging;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    
     public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers);
 
     public interface IJ2KDecoder
     {
-        void decode(UUID AssetId, byte[] assetData, DecodedCallback decodedReturn);
-        void syncdecode(UUID AssetId, byte[] j2kdata);
+        void BeginDecode(UUID assetID, byte[] j2kData, DecodedCallback callback);
+        void Decode(UUID assetID, byte[] j2kData);
     }
 }