diff options
| author | Diva Canto | 2011-10-15 20:23:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-10-15 20:23:26 -0700 |
| commit | bbd0e68c06b79acf0781d78e81fa292f549d676b (patch) | |
| tree | 2e545ba5df14c8f0db22f0313ecfbb10d325923c /OpenSim | |
| parent | improve method doc on Scene.OtherRegionUp() (diff) | |
| download | opensim-SC_OLD-bbd0e68c06b79acf0781d78e81fa292f549d676b.zip opensim-SC_OLD-bbd0e68c06b79acf0781d78e81fa292f549d676b.tar.gz opensim-SC_OLD-bbd0e68c06b79acf0781d78e81fa292f549d676b.tar.bz2 opensim-SC_OLD-bbd0e68c06b79acf0781d78e81fa292f549d676b.tar.xz | |
Guard HGAssetService against uninitialized variables and null arguments.
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; |