diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-28 17:52:06 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-28 17:52:06 -0700 |
| commit | a6adc00632d53445159b3ee91ecddea3fc667bff (patch) | |
| tree | 858b59d3c17341ed43ffd746593cc4c206294242 /indra/llinventory | |
| parent | b6ba0da7f5e8d830f776ec974287b2d451a4715f (diff) | |
| parent | 3bed004b5bb82e203d2e98ffc5d87273ea1dacc4 (diff) | |
Merge
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 4ef5df0b28..c050f20a9d 100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp @@ -181,6 +181,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; |