diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
commit | e777f9cbe6a10c7897fb6ba46fa300feae7831e7 (patch) | |
tree | 88b304403137989d3da13cac35b69277115619fe /indra/newview/llfavoritesbar.h | |
parent | c4992e30654775c54e3dc4fb583375ec079b23a4 (diff) | |
parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) |
Merge with remote repo
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
-rw-r--r-- | indra/newview/llfavoritesbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index ea2a3d08e2..e90d13f9d5 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -141,7 +141,7 @@ private: * inserts an item identified by insertedItemId BEFORE an item identified by beforeItemId. * this function assumes that an item identified by insertedItemId doesn't exist in items array. */ - void insertBeforeItem(LLInventoryModel::item_array_t& items, const LLUUID& beforeItemId, const LLUUID& insertedItemId); + void insertBeforeItem(LLInventoryModel::item_array_t& items, const LLUUID& beforeItemId, LLViewerInventoryItem* insertedItem); // finds an item by it's UUID in the items array LLInventoryModel::item_array_t::iterator findItemByUUID(LLInventoryModel::item_array_t& items, const LLUUID& id); |