diff options
| author | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
| commit | 4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch) | |
| tree | f52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |
| parent | Finally remove the requirement for an InventoryItem/FolderBase object to (diff) | |
| parent | New config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff) | |
| download | opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2 opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index f4014db..4361310 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
| @@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 58 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, | 58 | void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, |
| 59 | bool isModerator, bool textMute); | 59 | bool isModerator, bool textMute); |
| 60 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 60 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
| 61 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | ||
| 62 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); | 61 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); |
| 63 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); | 62 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); |
| 64 | OSD BuildEvent(string eventName, OSD eventBody); | 63 | OSD BuildEvent(string eventName, OSD eventBody); |