diff options
| author | Melanie | 2013-07-29 02:08:05 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-29 02:08:05 +0100 |
| commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
| tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Same issue. (diff) | |
| download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEventQueue.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index 5512642..3780ece 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
| @@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 53 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, | 53 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, |
| 54 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, | 54 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, |
| 55 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); | 55 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); |
| 56 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, | 56 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, |
| 57 | bool isModerator, bool textMute); | 57 | bool isModerator, bool textMute); |
| 58 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 58 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
| 59 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | 59 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); |