diff options
| author | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-26 10:53:59 -0700 |
| commit | 0ebdba45f6fbcecfe0aa63bb37ddcde2efba6d87 (patch) | |
| tree | dcfb58e0756c0034075345363559e068f53e8f2a /indra/newview/llinventorymodel.cpp | |
| parent | dd672e6dfbe6347e7498fb32b9cade6a2133f4a8 (diff) | |
| parent | 74279f551b84a409af52634df4b7d78294a818dc (diff) | |
Merge with dessie/viewer-public to get Callum's webkit changes
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index d68b4c749d..06a688d115 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -566,6 +566,11 @@ const LLUUID& LLInventoryModel::getLinkedItemID(const LLUUID& object_id) const return item->getLinkedUUID(); } +LLViewerInventoryItem* LLInventoryModel::getLinkedItem(const LLUUID& object_id) const +{ + return object_id.notNull() ? getItem(getLinkedItemID(object_id)) : NULL; +} + LLInventoryModel::item_array_t LLInventoryModel::collectLinkedItems(const LLUUID& id, const LLUUID& start_folder_id) { |