Merge branch 'master' into careminster

Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs

2 files changed, 22 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 04df9c3..39a760c 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -82,7 +82,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If true, only request a rebake for the textures that are missing.
         /// If false then we request a rebake of all textures for which we already have references.
         /// </param>
-        void RequestRebake(IScenePresence sp, bool missingTexturesOnly);
+        /// <returns>
+        /// Number of rebake requests made.  This will depend upon whether we've previously received texture IDs.
+        /// </returns>
+        int RequestRebake(IScenePresence sp, bool missingTexturesOnly);
 
         void QueueAppearanceSend(UUID agentid);
         void QueueAppearanceSave(UUID agentid);
diff --git a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
index 856eb11..46d03b3 100644
--- a/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs
@@ -35,6 +35,23 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IJ2KDecoder
     {
         void BeginDecode(UUID assetID, byte[] j2kData, DecodedCallback callback);
-        void Decode(UUID assetID, byte[] j2kData);
+
+        /// <summary>
+        /// Provides a synchronous decode so that caller can be assured that this executes before the next line
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="j2kData"></param>
+        /// <returns>true if decode was successful.  false otherwise.</returns>
+        bool Decode(UUID assetID, byte[] j2kData);
+
+        /// <summary>
+        /// Provides a synchronous decode so that caller can be assured that this executes before the next line
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="j2kData"></param>
+        /// <param name="layers">layer data</param>
+        /// <param name="components">number of components</param>
+        /// <returns>true if decode was successful.  false otherwise.</returns>
+        bool Decode(UUID assetID, byte[] j2kData, out OpenJPEG.J2KLayerInfo[] layers, out int components);
     }
 }