diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index fe0da0b..43c1693 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
| @@ -91,7 +91,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 91 | 91 | ||
| 92 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 92 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
| 93 | httpResponse.ContentType = | 93 | httpResponse.ContentType = |
| 94 | ServerUtils.SLAssetTypeToContentType(metadata.Type); | 94 | SLUtil.SLAssetTypeToContentType(metadata.Type); |
| 95 | } | 95 | } |
| 96 | else | 96 | else |
| 97 | { | 97 | { |
| @@ -111,7 +111,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 111 | 111 | ||
| 112 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | 112 | httpResponse.StatusCode = (int)HttpStatusCode.OK; |
| 113 | httpResponse.ContentType = | 113 | httpResponse.ContentType = |
| 114 | ServerUtils.SLAssetTypeToContentType(asset.Type); | 114 | SLUtil.SLAssetTypeToContentType(asset.Type); |
| 115 | } | 115 | } |
| 116 | else | 116 | else |
| 117 | { | 117 | { |