diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:02:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:02:21 +0100 |
| commit | 83f108503aa5a34bf24ef0a167d1b76ba3800a38 (patch) | |
| tree | 1e5227e803980b3df83a77e0d0c39623e0fa2069 /indra/newview/llinventorybridge.cpp | |
| parent | bd708f82bd3b87051e03a2794ce417ae6f432c08 (diff) | |
| parent | 2f2a0ad38aecc1e9118cb51b86de578d56853311 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7e710ce8e1..53622f7188 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3989,6 +3989,11 @@ std::string LLObjectBridge::getLabelSuffix() const { if (get_is_item_worn(mUUID)) { + if (!isAgentAvatarValid()) + { + return LLItemBridge::getLabelSuffix() + LLTrans::getString("worn"); + } + std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID); // e.g. "(worn on ...)" / "(attached to ...)" |