diff options
| author | BlueWall | 2011-12-07 07:52:24 -0500 |
|---|---|---|
| committer | BlueWall | 2011-12-07 07:52:24 -0500 |
| commit | 6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch) | |
| tree | 6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Capabilities/LLSDStreamHandler.cs | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| parent | Stop accidentally setting up the UploadTexture caps handler with the same url... (diff) | |
| download | opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2 opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
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 7aaa994..c7c1fc9 100644 --- a/OpenSim/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
| @@ -45,7 +45,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | public override byte[] Handle(string path, Stream request, | 47 | public override byte[] Handle(string path, Stream request, |
| 48 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 48 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 49 | { | 49 | { |
| 50 | //Encoding encoding = Util.UTF8; | 50 | //Encoding encoding = Util.UTF8; |
| 51 | //StreamReader streamReader = new StreamReader(request, false); | 51 | //StreamReader streamReader = new StreamReader(request, false); |