diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
commit | b39dd46bf3e1c1ccdffe9b4ac4e9ad68b0c3cd69 (patch) | |
tree | 46e20f39ef94514de3f93a98aba75ad627209e84 /indra/newview/llfavoritesbar.h | |
parent | 5d99b221fa8ea75b128e3cc771ed91baa8b11311 (diff) | |
parent | e86adb53f4df0cb0b9d8ea9b6cc805782d9fcf71 (diff) |
merge changes for storm-1673
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 1b11d6196e..2f75b3bb0e 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -130,7 +130,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, LLViewerInventoryItem* insertedItem); + void insertItem(LLInventoryModel::item_array_t& items, const LLUUID& dest_item_id, LLViewerInventoryItem* insertedItem, bool insert_before); // 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); |