diff options
| author | John Hurliman | 2010-02-22 14:10:19 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:10:19 -0800 |
| commit | 71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch) | |
| tree | cca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Services/AssetService | |
| parent | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff) | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| download | opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2 opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz | |
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index a91b632..b9723a8 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -81,12 +81,12 @@ namespace OpenSim.Services.AssetService | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | public AssetBase Get(string id) | 83 | public AssetBase Get(string id) |
| 84 | { | 84 | { |
| 85 | UUID assetID; | 85 | UUID assetID; |
| 86 | 86 | ||
| 87 | if (!UUID.TryParse(id, out assetID)) | 87 | if (!UUID.TryParse(id, out assetID)) |
| 88 | { | 88 | { |
| 89 | m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id); | 89 | m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id); |
| 90 | return null; | 90 | return null; |
| 91 | } | 91 | } |
| 92 | 92 | ||