diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
commit | d6a2c5965e6b0b07014e8fc2dbb16edc463e0566 (patch) | |
tree | 879d891f1c6a743529d7683db3d322541e5d39f5 /indra/newview/llfavoritesbar.h | |
parent | 5db497e398d537a7f3b23c50336e2825006e0907 (diff) | |
parent | 437449044583d50c8cad694e65e5a4a23a55d768 (diff) |
merge from 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); |