aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorDiva Canto2010-05-20 15:14:14 -0700
committerDiva Canto2010-05-20 15:14:14 -0700
commit13c22015e588284df1b74b7f5edad0df97ca3d3c (patch)
treea9932ddb546f314c5835e14f8619e5a20b9e4388 /OpenSim/Services/Connectors/SimianGrid
parentMerging slimupdates2 (diff)
downloadopensim-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/Services/Connectors/SimianGrid')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs4
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs6
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
index 8cc5671..a871d07 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
@@ -40,10 +40,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
40 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 private IGridUserService m_GridUserService; 43 private SimianPresenceServiceConnector m_GridUserService;
44 private Scene m_aScene; 44 private Scene m_aScene;
45 45
46 public SimianActivityDetector(IGridUserService guservice) 46 public SimianActivityDetector(SimianPresenceServiceConnector guservice)
47 { 47 {
48 m_GridUserService = guservice; 48 m_GridUserService = guservice;
49 m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started"); 49 m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started");
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index ec9cf67..6f17931 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -298,6 +298,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
298 return UpdateSession(sessionID, regionID, lastPosition, lastLookAt); 298 return UpdateSession(sessionID, regionID, lastPosition, lastLookAt);
299 } 299 }
300 300
301 public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
302 {
303 // Never called
304 return false;
305 }
306
301 public GridUserInfo GetGridUserInfo(string user) 307 public GridUserInfo GetGridUserInfo(string user)
302 { 308 {
303 m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); 309 m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);