diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs index 67a06f3..b8703c6 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | using OpenSim.Services.Interfaces; | ||
32 | using OpenMetaverse; | 33 | using OpenMetaverse; |
33 | using log4net; | 34 | using log4net; |
34 | 35 | ||
@@ -38,12 +39,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
38 | { | 39 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 41 | ||
41 | private SimianPresenceServiceConnector m_GridUserService; | 42 | private IGridUserService m_GridUserService; |
42 | private Scene m_aScene; | ||
43 | 43 | ||
44 | public SimianActivityDetector(SimianPresenceServiceConnector guservice) | 44 | public SimianActivityDetector(IGridUserService guService) |
45 | { | 45 | { |
46 | m_GridUserService = guservice; | 46 | m_GridUserService = guService; |
47 | m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started"); | 47 | m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started"); |
48 | } | 48 | } |
49 | 49 | ||
@@ -54,9 +54,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
54 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; | 54 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; |
55 | scene.EventManager.OnNewClient += OnNewClient; | 55 | scene.EventManager.OnNewClient += OnNewClient; |
56 | scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel; | 56 | scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel; |
57 | |||
58 | if (m_aScene == null) | ||
59 | m_aScene = scene; | ||
60 | } | 57 | } |
61 | 58 | ||
62 | public void RemoveRegion(Scene scene) | 59 | public void RemoveRegion(Scene scene) |
@@ -101,9 +98,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
101 | } | 98 | } |
102 | 99 | ||
103 | m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); | 100 | m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); |
104 | m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat); | 101 | m_GridUserService.LoggedOut(client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID, position, lookat); |
105 | } | 102 | } |
106 | |||
107 | } | 103 | } |
108 | 104 | ||
109 | void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID) | 105 | void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID) |