diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index f2bae58..f2ce064 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Tests.Common | |||
46 | { | 46 | { |
47 | public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule | 47 | public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule |
48 | { | 48 | { |
49 | public class Event | 49 | public class Event |
50 | { | 50 | { |
51 | public string Name { get; set; } | 51 | public string Name { get; set; } |
52 | public object[] Args { get; set; } | 52 | public object[] Args { get; set; } |
@@ -64,7 +64,7 @@ namespace OpenSim.Tests.Common | |||
64 | 64 | ||
65 | public void Close() {} | 65 | public void Close() {} |
66 | 66 | ||
67 | public void AddRegion(Scene scene) | 67 | public void AddRegion(Scene scene) |
68 | { | 68 | { |
69 | Events = new Dictionary<UUID, List<Event>>(); | 69 | Events = new Dictionary<UUID, List<Event>>(); |
70 | scene.RegisterModuleInterface<IEventQueue>(this); | 70 | scene.RegisterModuleInterface<IEventQueue>(this); |
@@ -108,12 +108,12 @@ namespace OpenSim.Tests.Common | |||
108 | AddEvent(avatarID, "Enqueue", o); | 108 | AddEvent(avatarID, "Enqueue", o); |
109 | return true; | 109 | return true; |
110 | } | 110 | } |
111 | 111 | /* | |
112 | public void DisableSimulator(ulong handle, UUID avatarID) | 112 | public void DisableSimulator(ulong handle, UUID avatarID) |
113 | { | 113 | { |
114 | AddEvent(avatarID, "DisableSimulator", handle); | 114 | AddEvent(avatarID, "DisableSimulator", handle); |
115 | } | 115 | } |
116 | 116 | */ | |
117 | public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) | 117 | public void EnableSimulator (ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) |
118 | { | 118 | { |
119 | AddEvent(avatarID, "EnableSimulator", handle); | 119 | AddEvent(avatarID, "EnableSimulator", handle); |
@@ -138,18 +138,23 @@ namespace OpenSim.Tests.Common | |||
138 | } | 138 | } |
139 | 139 | ||
140 | public void ChatterboxInvitation( | 140 | public void ChatterboxInvitation( |
141 | UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, | 141 | UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, |
142 | byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, | 142 | byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, |
143 | UUID transactionID, bool fromGroup, byte[] binaryBucket) | 143 | UUID transactionID, bool fromGroup, byte[] binaryBucket) |
144 | { | 144 | { |
145 | AddEvent( | 145 | AddEvent( |
146 | toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, | 146 | toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, |
147 | timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket); | 147 | timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket); |
148 | } | 148 | } |
149 | 149 | ||
150 | public void ChatterBoxSessionAgentListUpdates (UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, bool isModerator, bool textMute) | 150 | public void ChatterBoxSessionAgentListUpdates (UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, bool isModerator, bool textMute , bool isEnterorLeave) |
151 | { | ||
152 | AddEvent(toAgent, "ChatterBoxSessionAgentListUpdates", sessionID, fromAgent, canVoiceChat, isModerator, textMute, isEnterorLeave); | ||
153 | } | ||
154 | |||
155 | public void ChatterBoxForceClose (UUID toAgent, UUID sessionID, string reason) | ||
151 | { | 156 | { |
152 | AddEvent(toAgent, "ChatterBoxSessionAgentListUpdates", sessionID, fromAgent, canVoiceChat, isModerator, textMute); | 157 | AddEvent(toAgent, "ForceCloseChatterBoxSession", sessionID, reason); |
153 | } | 158 | } |
154 | 159 | ||
155 | public void ParcelProperties (OpenMetaverse.Messages.Linden.ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID) | 160 | public void ParcelProperties (OpenMetaverse.Messages.Linden.ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID) |
@@ -157,9 +162,9 @@ namespace OpenSim.Tests.Common | |||
157 | AddEvent(avatarID, "ParcelProperties", parcelPropertiesMessage); | 162 | AddEvent(avatarID, "ParcelProperties", parcelPropertiesMessage); |
158 | } | 163 | } |
159 | 164 | ||
160 | public void GroupMembership (OpenMetaverse.Packets.AgentGroupDataUpdatePacket groupUpdate, UUID avatarID) | 165 | public void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data) |
161 | { | 166 | { |
162 | AddEvent(avatarID, "GroupMembership", groupUpdate); | 167 | AddEvent(receiverAgent, "AgentGroupDataUpdate", data); |
163 | } | 168 | } |
164 | 169 | ||
165 | public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono) | 170 | public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono) |