summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-16 16:12:16 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-16 16:12:16 +0300
commitfb11213c04269ee35c32d35cfeaafb035b0b321f (patch)
treefbb7310e91b9708cdb81cb929f73ab599ca9dc53 /indra/newview/llsidepanelappearance.cpp
parent6b0de5a0007fc038021155146d11480215fd472d (diff)
parented621a6ef02c4699404e8072d83c44b359bfcd24 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index adfd457664..33a464fea6 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);
}