Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 12 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index dfc269e..7edd75a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -30,6 +30,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
@@ -38,26 +39,27 @@ namespace OpenSim.Region.Framework.Interfaces
         bool Enqueue(OSD o, UUID avatarID);
 
         // These are required to decouple Scenes from EventQueueHelper
-        void DisableSimulator(ulong handle, UUID avatarID);
+//        void DisableSimulator(ulong handle, UUID avatarID);
         void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY);
-        void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 
+        void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint,
                                          string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY);
-        void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+        void TeleportFinishEvent(ulong regionHandle, byte simAccess,
                                  IPEndPoint regionExternalEndPoint,
-                                 uint locationID, uint flags, string capsURL, 
+                                 uint locationID, uint flags, string capsURL,
                                  UUID agentID, int regionSizeX, int regionSizeY);
         void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
                          IPEndPoint newRegionExternalEndPoint,
                          string capsURL, UUID avatarID, UUID sessionID,
                             int regionSizeX, int regionSizeY);
         void ChatterboxInvitation(UUID sessionID, string sessionName,
-                                  UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
-                                  uint timeStamp, bool offline, int parentEstateID, Vector3 position,
-                                  uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
-        void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, 
-                                               bool isModerator, bool textMute);
+                                UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
+                                uint timeStamp, bool offline, int parentEstateID, Vector3 position,
+                                uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
+        void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent,
+                                bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave);
+        void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason);
         void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
-        void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
+        void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data);
         OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono);
         OSD BuildEvent(string eventName, OSD eventBody);
         void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);