From c268e342d19b6cc5969b1c1d94f20a3f4eb844ef Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 3 Jan 2010 09:35:12 -0800 Subject: * Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle. * Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now. * Completed SimulationServiceConnector and corresponding handlers. --- OpenSim/Services/Interfaces/ISimulationService.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'OpenSim/Services/Interfaces/ISimulationService.cs') diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index 7ba3e66..14f462c 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs @@ -29,6 +29,8 @@ using System; using OpenSim.Framework; using OpenMetaverse; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; + namespace OpenSim.Services.Interfaces { public interface ISimulationService @@ -37,7 +39,7 @@ namespace OpenSim.Services.Interfaces #region Agents - bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, uint flags, out string reason); + bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason); /// /// Full child agent update. @@ -45,7 +47,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool UpdateAgent(ulong regionHandle, AgentData data); + bool UpdateAgent(GridRegion destination, AgentData data); /// /// Short child agent update, mostly for position. @@ -53,9 +55,9 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool UpdateAgent(ulong regionHandle, AgentPosition data); + bool UpdateAgent(GridRegion destination, AgentPosition data); - bool RetrieveAgent(ulong regionHandle, UUID id, out IAgentData agent); + bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent); /// /// Message from receiving region to departing region, telling it got contacted by the client. @@ -65,7 +67,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool ReleaseAgent(ulong regionHandle, UUID id, string uri); + bool ReleaseAgent(GridRegion destination, UUID id, string uri); /// /// Close agent. @@ -73,7 +75,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool CloseAgent(ulong regionHandle, UUID id); + bool CloseAgent(GridRegion destination, UUID id); #endregion Agents @@ -86,7 +88,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool CreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall); + bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall); /// /// Create an object from the user's inventory in the destination region. @@ -96,7 +98,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - bool CreateObject(ulong regionHandle, UUID userID, UUID itemID); + bool CreateObject(GridRegion destination, UUID userID, UUID itemID); #endregion Objects -- cgit v1.1