diff options
Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right.
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index c14ad99..8e4d7d0 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -32,6 +32,7 @@ using System.Net; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | 33 | ||
34 | using OpenSim.Server.Base; | 34 | using OpenSim.Server.Base; |
35 | using OpenSim.Server.Handlers.Base; | ||
35 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers.HttpServer; | 38 | using OpenSim.Framework.Servers.HttpServer; |
@@ -88,7 +89,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
88 | UUID agentID; | 89 | UUID agentID; |
89 | string action; | 90 | string action; |
90 | ulong regionHandle; | 91 | ulong regionHandle; |
91 | if (!Utils.GetParams(path, out agentID, out regionHandle, out action)) | 92 | if (!RestHandlerUtils.GetParams(path, out agentID, out regionHandle, out action)) |
92 | { | 93 | { |
93 | m_log.InfoFormat("[AgentPostHandler]: Invalid parameters for agent message {0}", path); | 94 | m_log.InfoFormat("[AgentPostHandler]: Invalid parameters for agent message {0}", path); |
94 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; | 95 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; |
@@ -102,7 +103,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
102 | // Authentication | 103 | // Authentication |
103 | string authority = string.Empty; | 104 | string authority = string.Empty; |
104 | string authToken = string.Empty; | 105 | string authToken = string.Empty; |
105 | if (!Utils.GetAuthentication(httpRequest, out authority, out authToken)) | 106 | if (!RestHandlerUtils.GetAuthentication(httpRequest, out authority, out authToken)) |
106 | { | 107 | { |
107 | m_log.InfoFormat("[AgentPostHandler]: Authentication failed for agent message {0}", path); | 108 | m_log.InfoFormat("[AgentPostHandler]: Authentication failed for agent message {0}", path); |
108 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; | 109 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; |