aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-11-08 17:46:10 +0000
committerAdam Frisby2008-11-08 17:46:10 +0000
commit5a5e132a96d557bf79ac281f11e4324cac2d2ddf (patch)
tree064e71fbb26185d986c8422cf5fd5c732870097b
parentWork in progress on SECS stuff. Have been holding it off until after 0.6 rele... (diff)
downloadopensim-SC_OLD-5a5e132a96d557bf79ac281f11e4324cac2d2ddf.zip
opensim-SC_OLD-5a5e132a96d557bf79ac281f11e4324cac2d2ddf.tar.gz
opensim-SC_OLD-5a5e132a96d557bf79ac281f11e4324cac2d2ddf.tar.bz2
opensim-SC_OLD-5a5e132a96d557bf79ac281f11e4324cac2d2ddf.tar.xz
* Implemented OnClientConnect in Scene EventManager
* Identical to OnNewClient except it passes IClientCore instead of IClientAPI * See http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/EventManager.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index 99aac93..244b76f8 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Client;
31using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
32using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 33using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
33using System.Collections.Generic; 34using System.Collections.Generic;
@@ -55,8 +56,16 @@ namespace OpenSim.Region.Environment.Scenes
55 56
56 public event OnBackupDelegate OnBackup; 57 public event OnBackupDelegate OnBackup;
57 58
59 public delegate void OnClientConnectCoreDelegate(IClientCore client);
60
61 public event OnClientConnectCoreDelegate OnClientConnect;
62
58 public delegate void OnNewClientDelegate(IClientAPI client); 63 public delegate void OnNewClientDelegate(IClientAPI client);
59 64
65 /// <summary>
66 /// Depreciated in favour of OnClientConnect.
67 /// Will be marked Obsolete after IClientCore has 100% of IClientAPI interfaces.
68 /// </summary>
60 public event OnNewClientDelegate OnNewClient; 69 public event OnNewClientDelegate OnNewClient;
61 70
62 public delegate void OnNewPresenceDelegate(ScenePresence presence); 71 public delegate void OnNewPresenceDelegate(ScenePresence presence);
@@ -323,6 +332,7 @@ namespace OpenSim.Region.Environment.Scenes
323 private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole; 332 private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole;
324 private OnFrameDelegate handlerFrame = null; //OnFrame; 333 private OnFrameDelegate handlerFrame = null; //OnFrame;
325 private OnNewClientDelegate handlerNewClient = null; //OnNewClient; 334 private OnNewClientDelegate handlerNewClient = null; //OnNewClient;
335 private OnClientConnectCoreDelegate handlerClientConnect = null; //OnClientConnect
326 private OnNewPresenceDelegate handlerNewPresence = null; //OnNewPresence; 336 private OnNewPresenceDelegate handlerNewPresence = null; //OnNewPresence;
327 private OnRemovePresenceDelegate handlerRemovePresence = null; //OnRemovePresence; 337 private OnRemovePresenceDelegate handlerRemovePresence = null; //OnRemovePresence;
328 private OnBackupDelegate handlerBackup = null; //OnBackup; 338 private OnBackupDelegate handlerBackup = null; //OnBackup;
@@ -426,6 +436,12 @@ namespace OpenSim.Region.Environment.Scenes
426 handlerNewClient = OnNewClient; 436 handlerNewClient = OnNewClient;
427 if (handlerNewClient != null) 437 if (handlerNewClient != null)
428 handlerNewClient(client); 438 handlerNewClient(client);
439
440 if (client is IClientCore)
441 {
442 handlerClientConnect = OnClientConnect;
443 handlerClientConnect((IClientCore) client);
444 }
429 } 445 }
430 446
431 public void TriggerOnNewPresence(ScenePresence presence) 447 public void TriggerOnNewPresence(ScenePresence presence)