diff options
| author | Melanie | 2011-02-16 02:41:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-16 02:41:49 +0000 |
| commit | ccd6e5d07146b8dd033bd1af09594834e87a883b (patch) | |
| tree | e7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/Services | |
| parent | Add the country functions in the careminster API (diff) | |
| parent | Catch HttpServer exception: mantis #5381 (diff) | |
| download | opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2 opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 81ef225..c29bce8 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Services.AssetService | |||
| 93 | 93 | ||
| 94 | if (!UUID.TryParse(id, out assetID)) | 94 | if (!UUID.TryParse(id, out assetID)) |
| 95 | { | 95 | { |
| 96 | m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id); | 96 | m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested asset id {0}", id); |
| 97 | return null; | 97 | return null; |
| 98 | } | 98 | } |
| 99 | 99 | ||