diff options
author | Diva Canto | 2010-05-20 15:14:14 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-20 15:14:14 -0700 |
commit | 13c22015e588284df1b74b7f5edad0df97ca3d3c (patch) | |
tree | a9932ddb546f314c5835e14f8619e5a20b9e4388 /OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |
parent | Merging slimupdates2 (diff) | |
download | opensim-SC_OLD-13c22015e588284df1b74b7f5edad0df97ca3d3c.zip opensim-SC_OLD-13c22015e588284df1b74b7f5edad0df97ca3d3c.tar.gz opensim-SC_OLD-13c22015e588284df1b74b7f5edad0df97ca3d3c.tar.bz2 opensim-SC_OLD-13c22015e588284df1b74b7f5edad0df97ca3d3c.tar.xz |
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs index 7d2dc5a..83c8eac 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |||
@@ -56,7 +56,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
56 | // But we could trigger the position update more often | 56 | // But we could trigger the position update more often |
57 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; | 57 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; |
58 | scene.EventManager.OnNewClient += OnNewClient; | 58 | scene.EventManager.OnNewClient += OnNewClient; |
59 | scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel; | ||
60 | 59 | ||
61 | if (m_aScene == null) | 60 | if (m_aScene == null) |
62 | m_aScene = scene; | 61 | m_aScene = scene; |
@@ -72,7 +71,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
72 | { | 71 | { |
73 | m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); | 72 | m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); |
74 | 73 | ||
75 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | 74 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); |
76 | } | 75 | } |
77 | 76 | ||
78 | public void OnNewClient(IClientAPI client) | 77 | public void OnNewClient(IClientAPI client) |
@@ -105,12 +104,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
105 | 104 | ||
106 | } | 105 | } |
107 | 106 | ||
108 | void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID) | ||
109 | { | ||
110 | // TODO: grab the parcel ID from ILandModule | ||
111 | // and send that along | ||
112 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | ||
113 | } | ||
114 | |||
115 | } | 107 | } |
116 | } | 108 | } |