aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2012-01-26 17:00:58 -0800
committerDiva Canto2012-01-26 17:00:58 -0800
commit91ac21b9ec36d698bfaa7ecf6e8d981562ddb4c1 (patch)
tree25e4e71e91413afd1d894634ad18b38cccde723b /OpenSim/Services
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-91ac21b9ec36d698bfaa7ecf6e8d981562ddb4c1.zip
opensim-SC_OLD-91ac21b9ec36d698bfaa7ecf6e8d981562ddb4c1.tar.gz
opensim-SC_OLD-91ac21b9ec36d698bfaa7ecf6e8d981562ddb4c1.tar.bz2
opensim-SC_OLD-91ac21b9ec36d698bfaa7ecf6e8d981562ddb4c1.tar.xz
HG Inventoty: Guard against items not found.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/HypergridService/HGInventoryService.cs13
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