diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs b/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs index 4362e28..c874fdb 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncInventorySender.cs | |||
| @@ -144,10 +144,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 144 | // "[ASYNC INVENTORY SENDER]: Handling request from {0} for {1} on queue", fh.Client.Name, fh.ItemID); | 144 | // "[ASYNC INVENTORY SENDER]: Handling request from {0} for {1} on queue", fh.Client.Name, fh.ItemID); |
| 145 | 145 | ||
| 146 | InventoryItemBase item = m_scene.InventoryService.GetItem(fh.Client.AgentId, fh.ItemID); | 146 | InventoryItemBase item = m_scene.InventoryService.GetItem(fh.Client.AgentId, fh.ItemID); |
| 147 | 147 | ||
| 148 | if (item != null) | 148 | if (item != null) |
| 149 | fh.Client.SendInventoryItemDetails(item.Owner, item); | 149 | fh.Client.SendInventoryItemDetails(item.Owner, item); |
| 150 | 150 | ||
| 151 | // TODO: Possibly log any failure | 151 | // TODO: Possibly log any failure |
| 152 | } | 152 | } |
| 153 | } | 153 | } |