diff options
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 78b09cd..ded335d5 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -272,7 +272,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | public override byte[] Handle(string path, Stream request, | 274 | public override byte[] Handle(string path, Stream request, |
| 275 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 275 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 276 | { | 276 | { |
| 277 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); | 277 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); |
| 278 | 278 | ||
| @@ -459,7 +459,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | public override byte[] Handle(string path, Stream request, | 461 | public override byte[] Handle(string path, Stream request, |
| 462 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 462 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 463 | { | 463 | { |
| 464 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); | 464 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); |
| 465 | 465 | ||