Skip to content
Snippets Groups Projects
Commit 20bdbd48 authored by Vadim Savchuk's avatar Vadim Savchuk
Browse files

EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().

The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point.
Worked around by checking gAgentAvatarp for being valid.

I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/

--HG--
branch : product-engine
parent 953e0a61
No related branches found
No related tags found
Loading
...@@ -3989,6 +3989,11 @@ std::string LLObjectBridge::getLabelSuffix() const ...@@ -3989,6 +3989,11 @@ std::string LLObjectBridge::getLabelSuffix() const
{ {
if (get_is_item_worn(mUUID)) if (get_is_item_worn(mUUID))
{ {
if (!isAgentAvatarValid())
{
return LLItemBridge::getLabelSuffix() + LLTrans::getString("worn");
}
std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID); std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID);
// e.g. "(worn on ...)" / "(attached to ...)" // e.g. "(worn on ...)" / "(attached to ...)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment