Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 1 insertions, 25 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 20e0199..e8e375e 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -45,13 +45,6 @@ namespace OpenSim.Region.Framework.Interfaces
         void Deactivate();
         void Activate();
         UUID GetID();
-
-        /// <summary>
-        /// Bitfield indicating which strings should be processed as regex.
-        /// 1 corresponds to IWorldCommListenerInfo::GetName()
-        /// 2 corresponds to IWorldCommListenerInfo::GetMessage()
-        /// </summary>
-        int RegexBitfield { get; }
     }
 
     public interface IWorldComm
@@ -67,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// the script during 'peek' time. Parameter hostID is needed to
         /// determine the position of the script.
         /// </summary>
-        /// <param name="LocalID">localID of the script engine</param>
+        /// <param name="localID">localID of the script engine</param>
         /// <param name="itemID">UUID of the script engine</param>
         /// <param name="hostID">UUID of the SceneObjectPart</param>
         /// <param name="channel">channel to listen on</param>
@@ -77,23 +70,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns>number of the scripts handle</returns>
         int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
 
-         /// <summary>
-        /// Create a listen event callback with the specified filters.
-        /// The parameters localID,itemID are needed to uniquely identify
-        /// the script during 'peek' time. Parameter hostID is needed to
-        /// determine the position of the script.
-        /// </summary>
-        /// <param name="LocalID">localID of the script engine</param>
-        /// <param name="itemID">UUID of the script engine</param>
-        /// <param name="hostID">UUID of the SceneObjectPart</param>
-        /// <param name="channel">channel to listen on</param>
-        /// <param name="name">name to filter on</param>
-        /// <param name="id">key to filter on (user given, could be totally faked)</param>
-        /// <param name="msg">msg to filter on</param>
-        /// <param name="regexBitfield">Bitfield indicating which strings should be processed as regex.</param>
-        /// <returns>number of the scripts handle</returns>
-        int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg, int regexBitfield);
-
         /// <summary>
         /// This method scans over the objects which registered an interest in listen callbacks.
         /// For everyone it finds, it checks if it fits the given filter. If it does,  then