diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
commit | b81feb6ae7fd9d01b63999e53c5c231551d53200 (patch) | |
tree | 527df9920d7d27000981fe726e5fbed9deccadbd /indra/newview/llfavoritesbar.h | |
parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) |
Merge of viewer-2-0 changes
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); |