Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge

avinationmerge
Melanie 2011-10-25 02:15:06 +01:00
commit 57b51287ae
1 changed files with 3 additions and 0 deletions

View File

@ -129,6 +129,9 @@ namespace OpenSim.Services.HypergridService
protected void AdjustIdentifiers(AssetMetadata meta) protected void AdjustIdentifiers(AssetMetadata meta)
{ {
if (meta == null || m_Cache == null)
return;
UserAccount creator = m_Cache.GetUser(meta.CreatorID); UserAccount creator = m_Cache.GetUser(meta.CreatorID);
if (creator != null) if (creator != null)
meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName; meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName;