diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index f8e3d59..75efb79 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |||
| @@ -131,6 +131,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
| 131 | 131 | ||
| 132 | if (texture != null) | 132 | if (texture != null) |
| 133 | { | 133 | { |
| 134 | if (texture.Type != (sbyte)AssetType.Texture) | ||
| 135 | { | ||
| 136 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
| 137 | httpResponse.Send(); | ||
| 138 | return null; | ||
| 139 | } | ||
| 134 | SendTexture(httpRequest, httpResponse, texture); | 140 | SendTexture(httpRequest, httpResponse, texture); |
| 135 | } | 141 | } |
| 136 | else | 142 | else |
| @@ -147,6 +153,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
| 147 | 153 | ||
| 148 | if (texture != null) | 154 | if (texture != null) |
| 149 | { | 155 | { |
| 156 | if (texture.Type != (sbyte)AssetType.Texture) | ||
| 157 | { | ||
| 158 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
| 159 | httpResponse.Send(); | ||
| 160 | return null; | ||
| 161 | } | ||
| 150 | SendTexture(httpRequest, httpResponse, texture); | 162 | SendTexture(httpRequest, httpResponse, texture); |
| 151 | } | 163 | } |
| 152 | else | 164 | else |