diff options
| author | Justin Clark-Casey (justincc) | 2010-11-27 01:27:46 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-11-27 01:27:46 +0000 |
| commit | e0866faacc8a91b8e85fe6a5ecfe0655582d1470 (patch) | |
| tree | a1420137448e9c9318e80a0a039c811242e42125 | |
| parent | Refactor appearance and avatar data sending code. Paritioning the routines in... (diff) | |
| parent | If we fail to gather asset uuids for a particular asset, log the failing asse... (diff) | |
| download | opensim-SC_OLD-e0866faacc8a91b8e85fe6a5ecfe0655582d1470.zip opensim-SC_OLD-e0866faacc8a91b8e85fe6a5ecfe0655582d1470.tar.gz opensim-SC_OLD-e0866faacc8a91b8e85fe6a5ecfe0655582d1470.tar.bz2 opensim-SC_OLD-e0866faacc8a91b8e85fe6a5ecfe0655582d1470.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index aee2d10..3978a7d 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
| @@ -86,23 +86,33 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 86 | /// <param name="assetUuids">The assets gathered</param> | 86 | /// <param name="assetUuids">The assets gathered</param> |
| 87 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) | 87 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) |
| 88 | { | 88 | { |
| 89 | assetUuids[assetUuid] = assetType; | 89 | try |
| 90 | 90 | { | |
| 91 | if (AssetType.Bodypart == assetType || AssetType.Clothing == assetType) | 91 | assetUuids[assetUuid] = assetType; |
| 92 | { | 92 | |
| 93 | GetWearableAssetUuids(assetUuid, assetUuids); | 93 | if (AssetType.Bodypart == assetType || AssetType.Clothing == assetType) |
| 94 | } | 94 | { |
| 95 | else if (AssetType.Gesture == assetType) | 95 | GetWearableAssetUuids(assetUuid, assetUuids); |
| 96 | { | 96 | } |
| 97 | GetGestureAssetUuids(assetUuid, assetUuids); | 97 | else if (AssetType.Gesture == assetType) |
| 98 | } | 98 | { |
| 99 | else if (AssetType.LSLText == assetType) | 99 | GetGestureAssetUuids(assetUuid, assetUuids); |
| 100 | { | 100 | } |
| 101 | GetScriptAssetUuids(assetUuid, assetUuids); | 101 | else if (AssetType.LSLText == assetType) |
| 102 | { | ||
| 103 | GetScriptAssetUuids(assetUuid, assetUuids); | ||
| 104 | } | ||
| 105 | else if (AssetType.Object == assetType) | ||
| 106 | { | ||
| 107 | GetSceneObjectAssetUuids(assetUuid, assetUuids); | ||
| 108 | } | ||
| 102 | } | 109 | } |
| 103 | else if (AssetType.Object == assetType) | 110 | catch (Exception) |
| 104 | { | 111 | { |
| 105 | GetSceneObjectAssetUuids(assetUuid, assetUuids); | 112 | m_log.ErrorFormat( |
| 113 | "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", | ||
| 114 | assetUuid, assetType); | ||
| 115 | throw; | ||
| 106 | } | 116 | } |
| 107 | } | 117 | } |
| 108 | 118 | ||