Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-26 17:00:05 -08:00
commit b844fef58a
1 changed files with 25 additions and 15 deletions

View File

@ -85,6 +85,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="assetType">The type of the asset for the uuid given</param> /// <param name="assetType">The type of the asset for the uuid given</param>
/// <param name="assetUuids">The assets gathered</param> /// <param name="assetUuids">The assets gathered</param>
public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
{
try
{ {
assetUuids[assetUuid] = assetType; assetUuids[assetUuid] = assetType;
@ -105,6 +107,14 @@ namespace OpenSim.Region.Framework.Scenes
GetSceneObjectAssetUuids(assetUuid, assetUuids); GetSceneObjectAssetUuids(assetUuid, assetUuids);
} }
} }
catch (Exception)
{
m_log.ErrorFormat(
"[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}",
assetUuid, assetType);
throw;
}
}
/// <summary> /// <summary>
/// Gather all the asset uuids associated with a given object. /// Gather all the asset uuids associated with a given object.