ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 02:57:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-12-05 20:32:35 +00:00
parent 47d0a50a19 af9ccfa15c
commit bc17e2e9cf
56 changed files with 383 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@@ -272,7 +272,7 @@ namespace OpenSim.Server.Handlers.Simulation
}
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
// m_log.DebugFormat("[SIMULATION]: Stream handler called");
@@ -459,7 +459,7 @@ namespace OpenSim.Server.Handlers.Simulation
}
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
// m_log.DebugFormat("[SIMULATION]: Stream handler called");