diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
commit | 7d87e55c547a537526ee121dc68df6513d513f05 (patch) | |
tree | 3a62fbf7d145ca686945f89119ace8089d3d59b1 /indra/newview/llfavoritesbar.h | |
parent | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (diff) | |
parent | 07c04df983123d5fcf1c45f3900e66e1fd8542bc (diff) |
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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); |