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/Capabilities/LLSDStreamHandler.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDStreamHandler.cs')
| -rw-r--r-- | OpenSim/Capabilities/LLSDStreamHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs index 5df24b2..4fa1153 100644 --- a/OpenSim/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
| @@ -48,7 +48,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 48 | m_method = method; | 48 | m_method = method; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | public override byte[] Handle(string path, Stream request, | 51 | protected override byte[] ProcessRequest(string path, Stream request, |
| 52 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 52 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 53 | { | 53 | { |
| 54 | //Encoding encoding = Util.UTF8; | 54 | //Encoding encoding = Util.UTF8; |