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/Server/Handlers/Neighbour/NeighbourHandlers.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index 8a1f824..3525a01 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 58 | // TODO: unused: m_AuthenticationService = authentication; | 58 | // TODO: unused: m_AuthenticationService = authentication; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | public override byte[] Handle(string path, Stream request, | 61 | protected override byte[] ProcessRequest(string path, Stream request, |
| 62 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 62 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 63 | { | 63 | { |
| 64 | // Not implemented yet | 64 | // Not implemented yet |
| @@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 83 | // TODO: unused: m_AllowForeignGuests = foreignGuests; | 83 | // TODO: unused: m_AllowForeignGuests = foreignGuests; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | public override byte[] Handle(string path, Stream request, | 86 | protected override byte[] ProcessRequest(string path, Stream request, |
| 87 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 87 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 88 | { | 88 | { |
| 89 | byte[] result = new byte[0]; | 89 | byte[] result = new byte[0]; |
| @@ -176,7 +176,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 176 | // TODO: unused: m_AuthenticationService = authentication; | 176 | // TODO: unused: m_AuthenticationService = authentication; |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | public override byte[] Handle(string path, Stream request, | 179 | protected override byte[] ProcessRequest(string path, Stream request, |
| 180 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 180 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 181 | { | 181 | { |
| 182 | // Not implemented yet | 182 | // Not implemented yet |
| @@ -197,7 +197,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 197 | // TODO: unused: m_AuthenticationService = authentication; | 197 | // TODO: unused: m_AuthenticationService = authentication; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | public override byte[] Handle(string path, Stream request, | 200 | protected override byte[] ProcessRequest(string path, Stream request, |
| 201 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 201 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 202 | { | 202 | { |
| 203 | // Not implemented yet | 203 | // Not implemented yet |