summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.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
commit823588b393f79ee419bddb20caa5fb28328e19a0 (patch)
treefbb7310e91b9708cdb81cb929f73ab599ca9dc53 /indra/newview/llagentwearables.cpp
parentf523a589a7b4456d86e6ef90ff5b77ae0b416eae (diff)
parent7f085551431aa912a4a2be28e2b714d12f723809 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rw-r--r--indra/newview/llagentwearables.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 337878cf96..5db16d9250 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1756,7 +1756,7 @@ void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj
LLViewerObject *objectp = (*attachment_iter);
if (objectp)
{
- LLUUID object_item_id = objectp->getItemID();
+ LLUUID object_item_id = objectp->getAttachmentItemID();
if (requested_item_ids.find(object_item_id) != requested_item_ids.end())
{
// Object currently worn, was requested.