Merge branch 'master' into careminster

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

1 files changed, 4 insertions, 1 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);