Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 19 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
new file mode 100644
index 0000000..198256f
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IServiceThrottleModule
+    {
+        /// <summary>
+        /// Enqueue a continuation meant to get a resource from elsewhere.
+        /// As usual with CPS, caller beware: if that continuation is a never-ending computation,
+        /// the whole thread will be blocked, and no requests are processed
+        /// </summary>
+        /// <param name="category">Category of the resource (e.g. name, region)</param>
+        /// <param name="itemid">The resource identifier</param>
+        /// <param name="continuation">The continuation to be executed</param>
+        void Enqueue(string category, string itemid, Action continuation);
+    }
+
+}