diff options
| author | Diva Canto | 2014-05-07 17:00:12 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-07 17:00:12 -0700 |
| commit | f4cba27105f68914de455cf6a27b9126e086cea1 (patch) | |
| tree | d87599f942f1e839dc4262f18c946564528314be /OpenSim/Server | |
| parent | Allow Tools.Configger to take -inifile as argument (diff) | |
| parent | Add GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff) | |
| download | opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.zip opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2 opensim-SC-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index 5122a77..a77e67d 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 64 | { | 64 | { |
| 65 | asset = (AssetBase)xs.Deserialize(request); | 65 | asset = (AssetBase)xs.Deserialize(request); |
| 66 | } | 66 | } |
| 67 | catch (XmlException) | 67 | catch (Exception) |
| 68 | { | 68 | { |
| 69 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; | 69 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; |
| 70 | return null; | 70 | return null; |