OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-07-01 16:41:03 +02:00
parent d5cbe4cb75 b38a22506b
commit 2312504b04
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -271,6 +271,10 @@ namespace OpenSim.Services.Connectors
{ {
newID = SynchronousRestObjectRequester. newID = SynchronousRestObjectRequester.
MakeRequest<AssetBase, string>("POST", uri, asset); MakeRequest<AssetBase, string>("POST", uri, asset);
if (newID == null)
{
newID = UUID.Zero.ToString();
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -301,6 +305,10 @@ namespace OpenSim.Services.Connectors
} }
else else
{ {
if (asset.UploadAttempts > 0)
{
m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
}
if (newID != String.Empty) if (newID != String.Empty)
{ {
// Placing this here, so that this work with old asset servers that don't send any reply back // Placing this here, so that this work with old asset servers that don't send any reply back