diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/ISimulationService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index a963b8e..1c82b3e 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -75,8 +75,6 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// <returns></returns> | 75 | /// <returns></returns> |
76 | bool UpdateAgent(GridRegion destination, AgentPosition data); | 76 | bool UpdateAgent(GridRegion destination, AgentPosition data); |
77 | 77 | ||
78 | bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent); | ||
79 | |||
80 | bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason); | 78 | bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason); |
81 | 79 | ||
82 | /// <summary> | 80 | /// <summary> |
@@ -90,20 +88,12 @@ namespace OpenSim.Services.Interfaces | |||
90 | bool ReleaseAgent(UUID originRegion, UUID id, string uri); | 88 | bool ReleaseAgent(UUID originRegion, UUID id, string uri); |
91 | 89 | ||
92 | /// <summary> | 90 | /// <summary> |
93 | /// Close child agent. | ||
94 | /// </summary> | ||
95 | /// <param name="regionHandle"></param> | ||
96 | /// <param name="id"></param> | ||
97 | /// <returns></returns> | ||
98 | bool CloseChildAgent(GridRegion destination, UUID id); | ||
99 | |||
100 | /// <summary> | ||
101 | /// Close agent. | 91 | /// Close agent. |
102 | /// </summary> | 92 | /// </summary> |
103 | /// <param name="regionHandle"></param> | 93 | /// <param name="regionHandle"></param> |
104 | /// <param name="id"></param> | 94 | /// <param name="id"></param> |
105 | /// <returns></returns> | 95 | /// <returns></returns> |
106 | bool CloseAgent(GridRegion destination, UUID id); | 96 | bool CloseAgent(GridRegion destination, UUID id, string auth_token); |
107 | 97 | ||
108 | #endregion Agents | 98 | #endregion Agents |
109 | 99 | ||