diff options
| author | Melanie | 2011-11-06 20:12:57 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-06 20:12:57 +0000 |
| commit | 51bad0f8aecd069402d418c76bf943110c45e56c (patch) | |
| tree | 791d01b398bb7c13454d4598e4f46b627dd830be /OpenSim/Services | |
| parent | Break out the parts of ScenePresence that differ from core (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.zip opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.gz opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.bz2 opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 0feb59d..ec424c0 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -117,7 +117,15 @@ namespace OpenSim.Services.AssetService | |||
| 117 | return null; | 117 | return null; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | return m_Database.GetAsset(assetID); | 120 | try |
| 121 | { | ||
| 122 | return m_Database.GetAsset(assetID); | ||
| 123 | } | ||
| 124 | catch (Exception e) | ||
| 125 | { | ||
| 126 | m_log.ErrorFormat("[ASSET SERVICE]: Exception getting asset {0} {1}", assetID, e); | ||
| 127 | return null; | ||
| 128 | } | ||
| 121 | } | 129 | } |
| 122 | 130 | ||
| 123 | public virtual AssetBase GetCached(string id) | 131 | public virtual AssetBase GetCached(string id) |