diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IMoneyModule.cs (renamed from OpenSim/Region/Interfaces/IMoneyModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs (renamed from OpenSim/Region/Interfaces/IEventQueue.cs) | 25 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IGroupsModule.cs (renamed from OpenSim/Region/Interfaces/IGroupsModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs (renamed from OpenSim/Region/Interfaces/IMessageTransferModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IPresenceModule.cs (renamed from OpenSim/Region/Interfaces/IPresenceModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScriptModule.cs (renamed from OpenSim/Region/Interfaces/IScriptModule.cs) | 2 |
6 files changed, 29 insertions, 6 deletions
diff --git a/OpenSim/Region/Interfaces/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index 5dfb64c..7904e94 100644 --- a/OpenSim/Region/Interfaces/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Interfaces | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
34 | public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount); | 34 | public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount); |
35 | public interface IMoneyModule | 35 | public interface IMoneyModule |
diff --git a/OpenSim/Region/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index 5c327d9..cf609ae 100644 --- a/OpenSim/Region/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
@@ -26,16 +26,39 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Net; | ||
29 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenMetaverse.Packets; | ||
31 | using OpenMetaverse.StructuredData; | 33 | using OpenMetaverse.StructuredData; |
32 | using System.Collections.Generic; | 34 | using System.Collections.Generic; |
33 | using System.Text; | 35 | using System.Text; |
34 | 36 | ||
35 | namespace OpenSim.Region.Interfaces | 37 | namespace OpenSim.Region.Framework.Interfaces |
36 | { | 38 | { |
37 | public interface IEventQueue | 39 | public interface IEventQueue |
38 | { | 40 | { |
39 | bool Enqueue(OSD o, UUID avatarID); | 41 | bool Enqueue(OSD o, UUID avatarID); |
42 | |||
43 | // These are required to decouple Scenes from EventQueueHelper | ||
44 | void DisableSimulator(ulong handle, UUID avatarID); | ||
45 | void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID); | ||
46 | void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, | ||
47 | string capsPath); | ||
48 | void TeleportFinishEvent(ulong regionHandle, byte simAccess, | ||
49 | IPEndPoint regionExternalEndPoint, | ||
50 | uint locationID, uint flags, string capsURL, | ||
51 | UUID agentID); | ||
52 | void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, | ||
53 | IPEndPoint newRegionExternalEndPoint, | ||
54 | string capsURL, UUID avatarID, UUID sessionID); | ||
55 | void ChatterboxInvitation(UUID sessionID, string sessionName, | ||
56 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, | ||
57 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, | ||
58 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); | ||
59 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, | ||
60 | bool isModerator, bool textMute); | ||
61 | void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID); | ||
62 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | ||
40 | } | 63 | } |
41 | } | 64 | } |
diff --git a/OpenSim/Region/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs index c3f901a..16527d1 100644 --- a/OpenSim/Region/Interfaces/IGroupsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public delegate void NewGroupNotice(UUID groupID, UUID noticeID); | 35 | public delegate void NewGroupNotice(UUID groupID, UUID noticeID); |
36 | 36 | ||
diff --git a/OpenSim/Region/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs index ecaeceb..f0a5473 100644 --- a/OpenSim/Region/Interfaces/IMessageTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public delegate void MessageResultNotification(bool success); | 34 | public delegate void MessageResultNotification(bool success); |
35 | 35 | ||
diff --git a/OpenSim/Region/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs index 23cf064..011f8bb 100644 --- a/OpenSim/Region/Interfaces/IPresenceModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public struct PresenceInfo | 34 | public struct PresenceInfo |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs index 9dca862..65620d3 100644 --- a/OpenSim/Region/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IScriptModule | 34 | public interface IScriptModule |
35 | { | 35 | { |