aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
diff options
context:
space:
mode:
authorTom Grimshaw2010-07-01 08:48:02 -0700
committerTom Grimshaw2010-07-01 08:48:02 -0700
commit1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7 (patch)
tree5f350b5d8ad8d502751893859901dc145c75891f /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7.zip
opensim-SC-1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7.tar.gz
opensim-SC-1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7.tar.bz2
opensim-SC-1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7.tar.xz
Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception)
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index ae600bb..bc56963 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -271,6 +271,10 @@ namespace OpenSim.Services.Connectors
271 { 271 {
272 newID = SynchronousRestObjectRequester. 272 newID = SynchronousRestObjectRequester.
273 MakeRequest<AssetBase, string>("POST", uri, asset); 273 MakeRequest<AssetBase, string>("POST", uri, asset);
274 if (newID == null)
275 {
276 newID = UUID.Zero.ToString();
277 }
274 } 278 }
275 catch (Exception e) 279 catch (Exception e)
276 { 280 {