ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now

Browse Source
This commit is contained in:
John Hurliman
2010-09-29 14:24:32 -07:00
parent 0339d420e7
commit 9b7c99f0cf
9 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
View File

@@ -123,7 +123,7 @@ namespace OpenSim.Services.Connectors
return Set(sendData, userID, regionID, position, lookAt);
}
public bool SetLastPosition(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
//sendData["SCOPEID"] = scopeID.ToString();

8
OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
View File

@@ -29,6 +29,7 @@ using System;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
using log4net;
@@ -38,12 +39,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private SimianPresenceServiceConnector m_GridUserService;
private IGridUserService m_GridUserService;
private Scene m_aScene;
public SimianActivityDetector(SimianPresenceServiceConnector guservice)
public SimianActivityDetector(IGridUserService guService)
{
m_GridUserService = guservice;
m_GridUserService = guService;
m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started");
}
@@ -103,7 +104,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat);
}
}
void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID)

6
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@@ -304,12 +304,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
return UpdateSession(sessionID, regionID, lastPosition, lastLookAt);
}
public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{
// Never called
return false;
}
public GridUserInfo GetGridUserInfo(string user)
{
m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);