diff options
| author | UbitUmarov | 2016-07-04 08:30:07 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-04 08:30:07 +0100 |
| commit | 1d9e343b7ea5a8b36751fc334cd51b5573a1bb15 (patch) | |
| tree | 628b676a51022801ad25c83c4ecfbd0a90d7977a /OpenSim/Services/HypergridService/HGInventoryService.cs | |
| parent | add OSSL osGetPhysicsEngineName(). this returns a string with name and versio... (diff) | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-1d9e343b7ea5a8b36751fc334cd51b5573a1bb15.zip opensim-SC-1d9e343b7ea5a8b36751fc334cd51b5573a1bb15.tar.gz opensim-SC-1d9e343b7ea5a8b36751fc334cd51b5573a1bb15.tar.bz2 opensim-SC-1d9e343b7ea5a8b36751fc334cd51b5573a1bb15.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 9158b41..a0d25e3 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
| @@ -291,9 +291,9 @@ namespace OpenSim.Services.HypergridService | |||
| 291 | //{ | 291 | //{ |
| 292 | //} | 292 | //} |
| 293 | 293 | ||
| 294 | public override InventoryItemBase GetItem(InventoryItemBase item) | 294 | public override InventoryItemBase GetItem(UUID principalID, UUID itemID) |
| 295 | { | 295 | { |
| 296 | InventoryItemBase it = base.GetItem(item); | 296 | InventoryItemBase it = base.GetItem(principalID, itemID); |
| 297 | if (it != null) | 297 | if (it != null) |
| 298 | { | 298 | { |
| 299 | UserAccount user = m_Cache.GetUser(it.CreatorId); | 299 | UserAccount user = m_Cache.GetUser(it.CreatorId); |