diff options
author | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
commit | dd14c539af0fdfb6a489f62860b94b9c6b5282fb (patch) | |
tree | 48d1dd69f76d6ff69d5a51ecfc92cc84a642324c /OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |
parent | Report exception message as well as stack trace if a region fails to register... (diff) | |
parent | Fix a casting operation to use ToString() (diff) | |
download | opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.zip opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.gz opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.bz2 opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEventQueue.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index e093f0a..81e4952 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System.Net; | 28 | using System.Net; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenMetaverse.Packets; | 30 | using OpenMetaverse.Packets; |
31 | using OpenMetaverse.Messages.Linden; | ||
31 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
32 | 33 | ||
33 | namespace OpenSim.Region.Framework.Interfaces | 34 | namespace OpenSim.Region.Framework.Interfaces |
@@ -54,7 +55,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
54 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); | 55 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket); |
55 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, | 56 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, |
56 | bool isModerator, bool textMute); | 57 | bool isModerator, bool textMute); |
57 | void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID); | 58 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
58 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | 59 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); |
59 | } | 60 | } |
60 | } | 61 | } |