diff options
| author | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
| commit | abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef (patch) | |
| tree | 74506e8e519bdf13305ca595b4a74eed7952c6a4 /OpenSim/Services | |
| parent | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ... (diff) | |
| parent | HG Inventoty: Guard against items not found. (diff) | |
| download | opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.zip opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.gz opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.bz2 opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index daf8c3a..41d5a7a 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
| @@ -319,13 +319,14 @@ namespace OpenSim.Services.HypergridService | |||
| 319 | public override InventoryItemBase GetItem(InventoryItemBase item) | 319 | public override InventoryItemBase GetItem(InventoryItemBase item) |
| 320 | { | 320 | { |
| 321 | InventoryItemBase it = base.GetItem(item); | 321 | InventoryItemBase it = base.GetItem(item); |
| 322 | if (it != null) | ||
| 323 | { | ||
| 324 | UserAccount user = m_Cache.GetUser(it.CreatorId); | ||
| 322 | 325 | ||
| 323 | UserAccount user = m_Cache.GetUser(it.CreatorId); | 326 | // Adjust the creator data |
| 324 | 327 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) | |
| 325 | // Adjust the creator data | 328 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; |
| 326 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) | 329 | } |
| 327 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; | ||
| 328 | |||
| 329 | return it; | 330 | return it; |
| 330 | } | 331 | } |
| 331 | 332 | ||