diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
commit | 6c8494295ad05b127338681f8341dd5c9f53f9ea (patch) | |
tree | 1a43469fe92864f1f91bfb26eff51563aedd73d4 /indra/newview/llsidepanelappearance.cpp | |
parent | 482d3abc3c522b9922b479902685a0617ba162ce (diff) | |
parent | d77c3e360099cb2207fc1d42534f645b064171c6 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 98cd0b88eb..83329ebccf 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -473,7 +473,7 @@ void LLSidepanelAppearance::fetchInventory() { LLViewerObject* attached_object = (*attachment_iter); if (!attached_object) continue; - const LLUUID& item_id = attached_object->getItemID(); + const LLUUID& item_id = attached_object->getAttachmentItemID(); if (item_id.isNull()) continue; ids.push_back(item_id); } |