diff options
author | Justin Clark-Casey (justincc) | 2010-09-24 23:58:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-24 23:58:37 +0100 |
commit | 5bcf9ae2f97cd1d296b3844100f32ef9d5dc6d6f (patch) | |
tree | ceadf60f19dca8a3a115e1a4464c7b0d25fc1622 /OpenSim/Region/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5bcf9ae2f97cd1d296b3844100f32ef9d5dc6d6f.zip opensim-SC_OLD-5bcf9ae2f97cd1d296b3844100f32ef9d5dc6d6f.tar.gz opensim-SC_OLD-5bcf9ae2f97cd1d296b3844100f32ef9d5dc6d6f.tar.bz2 opensim-SC_OLD-5bcf9ae2f97cd1d296b3844100f32ef9d5dc6d6f.tar.xz |
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 65baa52..aee2d10 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -291,9 +291,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
291 | } | 291 | } |
292 | } | 292 | } |
293 | 293 | ||
294 | /// <summary> | ||
295 | /// Get the asset uuid associated with a gesture | ||
296 | /// </summary> | ||
297 | /// <param name="gestureUuid"></param> | ||
298 | /// <param name="assetUuids"></param> | ||
294 | protected void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids) | 299 | protected void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids) |
295 | { | 300 | { |
296 | AssetBase assetBase = GetAsset(gestureUuid); | 301 | AssetBase assetBase = GetAsset(gestureUuid); |
302 | if (null == assetBase) | ||
303 | return; | ||
297 | 304 | ||
298 | MemoryStream ms = new MemoryStream(assetBase.Data); | 305 | MemoryStream ms = new MemoryStream(assetBase.Data); |
299 | StreamReader sr = new StreamReader(ms); | 306 | StreamReader sr = new StreamReader(ms); |