diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-16 10:18:53 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-16 10:18:53 -0400 |
| commit | f2d7dfb1e6689968459ef680e608546d474da008 (patch) | |
| tree | 99e06775b461451c2a041ebf970022ca2cf00b0d /indra/newview/llagentwearables.cpp | |
| parent | 01ad22ce197ba3bbf97ee396e163e5de529ad2e8 (diff) | |
merge fixes
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rwxr-xr-x | indra/newview/llagentwearables.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 11666f6c8f..26626ad894 100755 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -654,7 +654,7 @@ public: /* virtual */ void fire(const LLUUID& inv_item) { LL_INFOS() << "One item created " << inv_item.asString() << LL_ENDL; - LLViewerInventoryItem *item = gInventory.getItem(inv_item); + LLConstPointer<LLInventoryObject> item = gInventory.getItem(inv_item); mItemsToLink.push_back(item); updatePendingWearable(inv_item); } |