aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2014-05-06 09:43:07 +0300
committerOren Hurvitz2014-05-06 09:43:07 +0300
commitef262799ca2795cabf9e2f63e29698872e0c9414 (patch)
tree4a883f6bd3d2adc838cec72a1c6ee3b708e425f1
parentWhen moving an item from a prim to a user's inventory, don't delete the item ... (diff)
downloadopensim-SC_OLD-ef262799ca2795cabf9e2f63e29698872e0c9414.zip
opensim-SC_OLD-ef262799ca2795cabf9e2f63e29698872e0c9414.tar.gz
opensim-SC_OLD-ef262799ca2795cabf9e2f63e29698872e0c9414.tar.bz2
opensim-SC_OLD-ef262799ca2795cabf9e2f63e29698872e0c9414.tar.xz
Better error handling in AssetServerPostHandler. Invalid XML causes an InvalidOperationException, not an XmlException
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs2
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;