diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Capabilities/LLSDStreamHandler.cs | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/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 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; |