diff options
| author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
| commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
| tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |
| parent | fix entity update flags update (diff) | |
| parent | catch some NULL refs (diff) | |
| download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz | |
merge issue
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index b525769..3f54ea5 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
| @@ -52,11 +52,12 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 52 | string capsURL, UUID avatarID, UUID sessionID, | 52 | string capsURL, UUID avatarID, UUID sessionID, |
| 53 | int regionSizeX, int regionSizeY); | 53 | int regionSizeX, int regionSizeY); |
| 54 | void ChatterboxInvitation(UUID sessionID, string sessionName, | 54 | void ChatterboxInvitation(UUID sessionID, string sessionName, |
| 55 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, | 55 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, |
| 56 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, | 56 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, |
| 57 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); | 57 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); |
| 58 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, | 58 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, |
| 59 | bool isModerator, bool textMute, bool isEnterorLeave); | 59 | bool canVoiceChat, bool isModerator, bool textMute, bool isEnterorLeave); |
| 60 | void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason); | ||
| 60 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 61 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
| 61 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); | 62 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); |
| 62 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); | 63 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); |