Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 22 insertions, 32 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
index 5312a31..78a43db 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFeature.cs
@@ -26,45 +26,35 @@
  */
 
 using System;
-using System.Xml.Serialization;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Region.CoreModules.World.Terrain
 {
-    public abstract class XmppStanza
+    public interface ITerrainFeature
     {
         /// <summary>
-        /// counter used for generating ID
+        /// Creates the feature.
         /// </summary>
-        [XmlIgnore]
-        private static ulong _ctr = 0;
+        /// <returns>
+        /// Empty string if successful, otherwise error message.
+        /// </returns>
+        /// <param name='map'>
+        /// ITerrainChannel holding terrain data.
+        /// </param>
+        /// <param name='args'>
+        /// command-line arguments from console.
+        /// </param>
+        string CreateFeature(ITerrainChannel map, string[] args);
 
         /// <summary>
-        /// recipient JID
+        /// Gets a string describing the usage.
         /// </summary>
-        [XmlAttribute("to")]
-        public string ToJid;
-
-        /// <summary>
-        /// sender JID
-        /// </summary>
-        [XmlAttribute("from")]
-        public string FromJid;
-
-        /// <summary>
-        /// unique ID.
-        /// </summary>
-        [XmlAttribute("id")]
-        public string MessageId;
-
-        public XmppStanza()
-        {
-        }
-
-        public XmppStanza(string fromJid, string toJid)
-        {
-            ToJid = toJid;
-            FromJid = fromJid;
-            MessageId = String.Format("OpenSim_{0}{1}", DateTime.UtcNow.Ticks, _ctr++);
-        }
+        /// <returns>
+        /// A string describing parameters for creating the feature.
+        /// Format is "feature-name <arg1> <arg2> ..."
+        /// </returns>
+        string GetUsage();
     }
+
 }
+