diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Services/AssetService/AssetService.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
| -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 | ||