diff options
| author | Melanie | 2011-05-20 22:38:05 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-20 22:38:05 +0100 |
| commit | e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9 (patch) | |
| tree | 746085bf27044b477fc4552228b14388565421ec /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | If a response cannot be obtained (the script has no handler) return a more fr... (diff) | |
| parent | Implement llGetLinKNumberOfSides(). (diff) | |
| download | opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.zip opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.gz opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.bz2 opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 17242dc..431f3dc 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1423,7 +1423,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1423 | if (item.AssetType == (int)AssetType.Link) | 1423 | if (item.AssetType == (int)AssetType.Link) |
| 1424 | { | 1424 | { |
| 1425 | InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID)); | 1425 | InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID)); |
| 1426 | linkedItemFolderIdsToSend.Add(linkedItem.Folder); | 1426 | |
| 1427 | // Take care of genuinely broken links where the target doesn't exist | ||
| 1428 | if (linkedItem != null) | ||
| 1429 | linkedItemFolderIdsToSend.Add(linkedItem.Folder); | ||
| 1427 | } | 1430 | } |
| 1428 | } | 1431 | } |
| 1429 | 1432 | ||