diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Map/MapAddServerConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index 4a61969..d438fc7 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
| @@ -99,7 +99,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 99 | m_Proxy = proxy; | 99 | m_Proxy = proxy; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 102 | protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 103 | { | 103 | { |
| 104 | // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); | 104 | // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); |
| 105 | StreamReader sr = new StreamReader(requestData); | 105 | StreamReader sr = new StreamReader(requestData); |