diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-28 21:04:29 +0100 |
| commit | 84f417f9ab8167c79989337e954d5504cbd9d9e2 (patch) | |
| tree | 040923e87ca6de31cb38f77d62f34a2e940f0f77 /indra/llinventory | |
| parent | ac52aa08862833ab243fb6afc8c20d148e02c55c (diff) | |
| parent | ec36c092a2a5995983a2dc97662c4de3e408ead4 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventorytype.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp index c268625064..2d4ee604b0 100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp @@ -210,6 +210,10 @@ bool LLInventoryType::cannotRestrictPermissions(LLInventoryType::EType type) bool inventory_and_asset_types_match(LLInventoryType::EType inventory_type, LLAssetType::EType asset_type) { + // Links can be of any inventory type. + if (LLAssetType::lookupIsLinkType(asset_type)) + return true; + const InventoryEntry *entry = LLInventoryDictionary::getInstance()->lookup(inventory_type); if (!entry) return false; |