OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-01-27 19:47:24 +00:00
parent 9d60b84f78 91ac21b9ec
commit 86b9e6fbed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Services/HypergridService/HGInventoryService.cs
View File

@ -319,13 +319,14 @@ namespace OpenSim.Services.HypergridService
public override InventoryItemBase GetItem(InventoryItemBase item) public override InventoryItemBase GetItem(InventoryItemBase item)
{ {
InventoryItemBase it = base.GetItem(item); InventoryItemBase it = base.GetItem(item);
if (it != null)
{
UserAccount user = m_Cache.GetUser(it.CreatorId); UserAccount user = m_Cache.GetUser(it.CreatorId);
// Adjust the creator data // Adjust the creator data
if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
}
return it; return it;
} }