diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-07 13:11:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-07 13:11:43 -0400 |
| commit | a15701de33007f60994181d8e7300d1e624de373 (patch) | |
| tree | 8ab254d1925954ab7fd9b214d440b496f737a033 /indra/newview/llinventorybridge.cpp | |
| parent | 663ffa3d01ddba94fb4aed6851a6f77e5f0ac7da (diff) | |
| parent | 33401ca9b1182946d8f25ae4fb2e2585c33a49da (diff) | |
merge issues from snowstorm team build
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index a36aa3dedf..5e2d2fa3f2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1376,16 +1376,17 @@ std::string LLItemBridge::getLabelSuffix() const LLInventoryItem* item = getItem(); if(item) { - // it's a bit confusing to put nocopy/nomod/etc on calling cards. + // Any type can have the link suffix... + BOOL broken_link = LLAssetType::lookupIsLinkType(item->getType()); + if (broken_link) return BROKEN_LINK; + + BOOL link = item->getIsLinkType(); + if (link) return LINK; + + // ...but it's a bit confusing to put nocopy/nomod/etc suffixes on calling cards. if(LLAssetType::AT_CALLINGCARD != item->getType() && item->getPermissions().getOwner() == gAgent.getID()) { - BOOL broken_link = LLAssetType::lookupIsLinkType(item->getType()); - if (broken_link) return BROKEN_LINK; - - BOOL link = item->getIsLinkType(); - if (link) return LINK; - BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID()); if (!copy) { |