diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-13 12:39:47 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-13 12:39:47 +0100 |
commit | 40eda71ff0cbc73efbe7520c73406cce39d763bb (patch) | |
tree | 21b2a705184078e44c73fee2a3b9a00534bc0f17 /indra/newview/llinventorybridge.cpp | |
parent | 0742f89208c016e5b9e73e471e669445bffde744 (diff) | |
parent | 44adcdecd0abb1726d6ae778e6e37b4da431e55a (diff) |
merge from PE's viewer-release
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 38f3521b2d..9bbc6514b4 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3985,6 +3985,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 ...)" |