summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Stone <stone@lindenlab.com>2011-10-13 08:10:25 -0400
committerAaron Stone <stone@lindenlab.com>2011-10-13 08:10:25 -0400
commita69ae967243e19bdc5969c34f0b1e94be794919d (patch)
tree336c95b3ffc8822bbbc1ee5343aeb2781cb34ec0
parent627bd3c5b998b6a743b7b412235bc5a287dadfc4 (diff)
VWR-27090 Allow Calling Cards to carry the "(link)" suffix in the Inventory pane
-rw-r--r--indra/newview/llinventorybridge.cpp15
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)
{