diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:47:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:47:08 +0100 |
| commit | 11e03dece4aa8417a3b6fd2234820d91f185875b (patch) | |
| tree | 742c8d48a2a33c973f7ec0f2f20cab4e806bcb3c /indra/newview/llappearancemgr.cpp | |
| parent | f0b1424cb8ec584c5b4a6cf74d1cd096090c06e1 (diff) | |
| parent | 76922597c219f27c5372a8a92e26e77338eb2dc2 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 296a580106..cecb2ee6ad 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1012,7 +1012,7 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up addCOFItemLink(item_to_wear, do_update, cb); break; case LLAssetType::AT_OBJECT: - rez_attachment(item_to_wear, NULL); + rez_attachment(item_to_wear, NULL, replace); break; default: return false;; } |