aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2011-12-05 20:32:35 +0000
committerMelanie2011-12-05 20:32:35 +0000
commitbc17e2e9cf1361116f9082326f7630b8f0c862ba (patch)
treed0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region/OptionalModules/World
parentAdd the proper result code as per the LL announcement for llTransferLindenDol... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip
opensim-SC_OLD-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz
opensim-SC_OLD-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2
opensim-SC_OLD-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
index f47d9c7..550b5d4 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
56 } 56 }
57 57
58 public override byte[] Handle(string path, Stream requestData, 58 public override byte[] Handle(string path, Stream requestData,
59 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 59 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
60 { 60 {
61 httpResponse.ContentType = "image/jpeg"; 61 httpResponse.ContentType = "image/jpeg";
62 62