diff options
| author | Melanie | 2013-06-11 01:03:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-11 01:03:15 +0100 |
| commit | a022ee576639c1bbceb5c4ba8de3cbd82e538bb3 (patch) | |
| tree | fb0d2ee165b7c87e814fc35c6551a26c2c6a488a /OpenSim/Capabilities | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 (diff) | |
| download | opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.zip opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.gz opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.bz2 opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index aa6203b..57b4667 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
| @@ -174,6 +174,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 174 | 174 | ||
| 175 | newTexture.Flags = AssetFlags.Collectable; | 175 | newTexture.Flags = AssetFlags.Collectable; |
| 176 | newTexture.Temporary = true; | 176 | newTexture.Temporary = true; |
| 177 | newTexture.Local = true; | ||
| 177 | m_assetService.Store(newTexture); | 178 | m_assetService.Store(newTexture); |
| 178 | WriteTextureData(request, response, newTexture, format); | 179 | WriteTextureData(request, response, newTexture, format); |
| 179 | return true; | 180 | return true; |