Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 14 insertions, 26 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
index 12263f4..a730cfd 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
@@ -25,36 +25,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Xml.Serialization;
+using System;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Caps=OpenSim.Framework.Capabilities.Caps;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Region.Framework.Interfaces
 {
-    /// <summary>
-    /// An IQ needs to have one of the follow types set.
-    /// </summary>
-    public enum XmppIqType
-    {
-        [XmlEnum("set")] set,
-        [XmlEnum("get")] get,
-        [XmlEnum("result")] result,
-        [XmlEnum("error")] error,
-    }
-
-    /// <summary>
-    /// XmppIqStanza needs to be subclassed as the query content is
-    /// specific to the query type.
-    /// </summary>
-    [XmlRoot("iq")]
-    public abstract class XmppIqStanza: XmppStanza
+    public interface IExternalCapsModule
     {
         /// <summary>
-        /// IQ type: one of set, get, result, error
+        /// This function extends the simple URL configuration in the caps handlers
+        /// to facilitate more interesting computation when an external handler is
+        /// sent to the viewer. 
         /// </summary>
-        [XmlAttribute("type")]
-        public XmppIqType Type;
-
-        public XmppIqStanza(): base()
-        {
-        }
+        /// <param name="agentID">New user UUID</param>
+        /// <param name="caps">Internal caps registry, where the external handler will be registered</param>
+        /// <param name="capName">Name of the specific cap we are registering</param>
+        /// <param name="urlSkel">The skeleton URL provided in the caps configuration</param>
+        bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel);
     }
 }