diff options
| author | Melanie | 2011-10-25 02:15:06 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:15:06 +0100 |
| commit | 57b51287ae580150160c9076bc0bf514ed097db1 (patch) | |
| tree | 7db635cfc5f6601df2abbe0efb1fcbcd9af38444 /OpenSim | |
| parent | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge (diff) | |
| parent | Guard HGAssetService against uninitialized variables and null arguments. (diff) | |
| download | opensim-SC-57b51287ae580150160c9076bc0bf514ed097db1.zip opensim-SC-57b51287ae580150160c9076bc0bf514ed097db1.tar.gz opensim-SC-57b51287ae580150160c9076bc0bf514ed097db1.tar.bz2 opensim-SC-57b51287ae580150160c9076bc0bf514ed097db1.tar.xz | |
Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGAssetService.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index a82d0d1..e518329 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
| @@ -129,6 +129,9 @@ namespace OpenSim.Services.HypergridService | |||
| 129 | 129 | ||
| 130 | protected void AdjustIdentifiers(AssetMetadata meta) | 130 | protected void AdjustIdentifiers(AssetMetadata meta) |
| 131 | { | 131 | { |
| 132 | if (meta == null || m_Cache == null) | ||
| 133 | return; | ||
| 134 | |||
| 132 | UserAccount creator = m_Cache.GetUser(meta.CreatorID); | 135 | UserAccount creator = m_Cache.GetUser(meta.CreatorID); |
| 133 | if (creator != null) | 136 | if (creator != null) |
| 134 | meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName; | 137 | meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName; |