Commit d76a22db authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merge with Appearance-Wearingd tip

--HG--
branch : .Catznip
parents d314ceb8 31c4c0d8
......@@ -7918,7 +7918,7 @@ void handle_attachment_find_original()
LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
if ( (SELECT_TYPE_ATTACHMENT == hSelection->getSelectType()) || (SELECT_TYPE_HUD == hSelection->getSelectType()) )
{
const LLViewerObject* pAttachObj = hSelection->getPrimaryObject();
const LLViewerObject* pAttachObj = hSelection->getFirstRootObject();
if ( (pAttachObj) && (!pAttachObj->isTempAttachment()) )
{
const LLUUID& idAttachItem = pAttachObj->getAttachmentItemID();
......@@ -7933,7 +7933,7 @@ bool enable_attachment_find_original()
if ( (SELECT_TYPE_ATTACHMENT != hSelection->getSelectType()) && (SELECT_TYPE_HUD != hSelection->getSelectType()) )
return false;
const LLViewerObject* pAttachObj = hSelection->getPrimaryObject();
const LLViewerObject* pAttachObj = hSelection->getFirstRootObject();
return (pAttachObj) && (!pAttachObj->isTempAttachment());
}
// [/SL:KB]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment