diff options
author | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
commit | ba5760a4d9d110890aab26a394479b36e60915d7 (patch) | |
tree | acad21a7c576de056bfa21a37027a673feab8fad /indra/newview/llinventorybridge.cpp | |
parent | bd64c483639ae33518609398fce7c51ddc73dae7 (diff) | |
parent | f2510ca0d629a2cd6cd85588698672f5a0c4e64a (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 72c54e5ce2..139713b96e 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1531,6 +1531,15 @@ LLUIImagePtr LLItemBridge::getIcon() const return LLInventoryIcon::getIcon(LLInventoryIcon::ICONNAME_OBJECT); } +LLUIImagePtr LLItemBridge::getIconOverlay() const +{ + if (getItem() && getItem()->getIsLinkType()) + { + return LLUI::getUIImage("Inv_Link"); + } + return NULL; +} + PermissionMask LLItemBridge::getPermissionMask() const { LLViewerInventoryItem* item = getItem(); |