diff options
author | Diva Canto | 2010-01-03 09:35:12 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-03 09:35:12 -0800 |
commit | c268e342d19b6cc5969b1c1d94f20a3f4eb844ef (patch) | |
tree | 713af45648bd51675b087af23b0ea0df9ab0f72c /OpenSim/Services/Interfaces/ISimulationService.cs | |
parent | Applied fix for avatar connectors similar to yesterday's fix of user account ... (diff) | |
download | opensim-SC-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.zip opensim-SC-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.gz opensim-SC-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.bz2 opensim-SC-c268e342d19b6cc5969b1c1d94f20a3f4eb844ef.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 18 |
1 files changed, 10 insertions, 8 deletions
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; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
33 | |||
32 | namespace OpenSim.Services.Interfaces | 34 | namespace OpenSim.Services.Interfaces |
33 | { | 35 | { |
34 | public interface ISimulationService | 36 | public interface ISimulationService |
@@ -37,7 +39,7 @@ namespace OpenSim.Services.Interfaces | |||
37 | 39 | ||
38 | #region Agents | 40 | #region Agents |
39 | 41 | ||
40 | bool CreateAgent(ulong regionHandle, AgentCircuitData aCircuit, uint flags, out string reason); | 42 | bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason); |
41 | 43 | ||
42 | /// <summary> | 44 | /// <summary> |
43 | /// Full child agent update. | 45 | /// Full child agent update. |
@@ -45,7 +47,7 @@ namespace OpenSim.Services.Interfaces | |||
45 | /// <param name="regionHandle"></param> | 47 | /// <param name="regionHandle"></param> |
46 | /// <param name="data"></param> | 48 | /// <param name="data"></param> |
47 | /// <returns></returns> | 49 | /// <returns></returns> |
48 | bool UpdateAgent(ulong regionHandle, AgentData data); | 50 | bool UpdateAgent(GridRegion destination, AgentData data); |
49 | 51 | ||
50 | /// <summary> | 52 | /// <summary> |
51 | /// Short child agent update, mostly for position. | 53 | /// Short child agent update, mostly for position. |
@@ -53,9 +55,9 @@ namespace OpenSim.Services.Interfaces | |||
53 | /// <param name="regionHandle"></param> | 55 | /// <param name="regionHandle"></param> |
54 | /// <param name="data"></param> | 56 | /// <param name="data"></param> |
55 | /// <returns></returns> | 57 | /// <returns></returns> |
56 | bool UpdateAgent(ulong regionHandle, AgentPosition data); | 58 | bool UpdateAgent(GridRegion destination, AgentPosition data); |
57 | 59 | ||
58 | bool RetrieveAgent(ulong regionHandle, UUID id, out IAgentData agent); | 60 | bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent); |
59 | 61 | ||
60 | /// <summary> | 62 | /// <summary> |
61 | /// Message from receiving region to departing region, telling it got contacted by the client. | 63 | /// Message from receiving region to departing region, telling it got contacted by the client. |
@@ -65,7 +67,7 @@ namespace OpenSim.Services.Interfaces | |||
65 | /// <param name="id"></param> | 67 | /// <param name="id"></param> |
66 | /// <param name="uri"></param> | 68 | /// <param name="uri"></param> |
67 | /// <returns></returns> | 69 | /// <returns></returns> |
68 | bool ReleaseAgent(ulong regionHandle, UUID id, string uri); | 70 | bool ReleaseAgent(GridRegion destination, UUID id, string uri); |
69 | 71 | ||
70 | /// <summary> | 72 | /// <summary> |
71 | /// Close agent. | 73 | /// Close agent. |
@@ -73,7 +75,7 @@ namespace OpenSim.Services.Interfaces | |||
73 | /// <param name="regionHandle"></param> | 75 | /// <param name="regionHandle"></param> |
74 | /// <param name="id"></param> | 76 | /// <param name="id"></param> |
75 | /// <returns></returns> | 77 | /// <returns></returns> |
76 | bool CloseAgent(ulong regionHandle, UUID id); | 78 | bool CloseAgent(GridRegion destination, UUID id); |
77 | 79 | ||
78 | #endregion Agents | 80 | #endregion Agents |
79 | 81 | ||
@@ -86,7 +88,7 @@ namespace OpenSim.Services.Interfaces | |||
86 | /// <param name="sog"></param> | 88 | /// <param name="sog"></param> |
87 | /// <param name="isLocalCall"></param> | 89 | /// <param name="isLocalCall"></param> |
88 | /// <returns></returns> | 90 | /// <returns></returns> |
89 | bool CreateObject(ulong regionHandle, ISceneObject sog, bool isLocalCall); | 91 | bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall); |
90 | 92 | ||
91 | /// <summary> | 93 | /// <summary> |
92 | /// Create an object from the user's inventory in the destination region. | 94 | /// Create an object from the user's inventory in the destination region. |
@@ -96,7 +98,7 @@ namespace OpenSim.Services.Interfaces | |||
96 | /// <param name="userID"></param> | 98 | /// <param name="userID"></param> |
97 | /// <param name="itemID"></param> | 99 | /// <param name="itemID"></param> |
98 | /// <returns></returns> | 100 | /// <returns></returns> |
99 | bool CreateObject(ulong regionHandle, UUID userID, UUID itemID); | 101 | bool CreateObject(GridRegion destination, UUID userID, UUID itemID); |
100 | 102 | ||
101 | #endregion Objects | 103 | #endregion Objects |
102 | 104 | ||