diff options
author | Melanie | 2012-03-28 02:20:40 +0100 |
---|---|---|
committer | Melanie | 2012-03-28 02:20:40 +0100 |
commit | b519cf63830f6248440525516eb7f70eba86abf3 (patch) | |
tree | 085ad7245d7dbdb59113d8e5b0822529703d0916 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Add SendRemoveInventoryFolders which allows to remove one or more (diff) | |
parent | Add a corresponding method for items. HG v2 (diff) | |
download | opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.zip opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.tar.gz opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.tar.bz2 opensim-SC_OLD-b519cf63830f6248440525516eb7f70eba86abf3.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 853491b..470ce2e 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -72,9 +72,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
72 | public delegate void OnNewClientDelegate(IClientAPI client); | 72 | public delegate void OnNewClientDelegate(IClientAPI client); |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Deprecated in favour of OnClientConnect. | 75 | /// Triggered when a new client is added to the scene. |
76 | /// Will be marked Obsolete after IClientCore has 100% of IClientAPI interfaces. | ||
77 | /// </summary> | 76 | /// </summary> |
77 | /// <remarks> | ||
78 | /// Triggered before OnClientLogin. | ||
79 | /// </remarks> | ||
78 | public event OnNewClientDelegate OnNewClient; | 80 | public event OnNewClientDelegate OnNewClient; |
79 | 81 | ||
80 | /// <summary> | 82 | /// <summary> |
@@ -192,6 +194,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
192 | 194 | ||
193 | public delegate void ClientClosed(UUID clientID, Scene scene); | 195 | public delegate void ClientClosed(UUID clientID, Scene scene); |
194 | 196 | ||
197 | /// <summary> | ||
198 | /// Fired when a client is removed from a scene. | ||
199 | /// </summary> | ||
200 | /// <remarks> | ||
201 | /// At the point of firing, the scene still contains the client's scene presence. | ||
202 | /// </remarks> | ||
195 | public event ClientClosed OnClientClosed; | 203 | public event ClientClosed OnClientClosed; |
196 | 204 | ||
197 | public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID); | 205 | public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID); |