summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-17 11:41:12 -0700
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-17 11:41:12 -0700
commitb5a8534116a89f79ab3b76cde3880bff5c998eeb (patch)
tree52160a99161c58d9330d41ac8dd57be355f332b3 /indra/newview/llwearableitemslist.h
parent492c189e24242cedd10dca47c31ffddccf200fcc (diff)
parentcc93aa8d6e3aac2b98b02823c253c637b1a9b94e (diff)
(final?) hairy merge from viewer-release to viewer-public
Diffstat (limited to 'indra/newview/llwearableitemslist.h')
-rw-r--r--indra/newview/llwearableitemslist.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index b5e64abad0..62e35a8eef 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -39,7 +39,6 @@
// newview
#include "llinventoryitemslist.h"
#include "llinventorylistitem.h"
-#include "llinventorymodel.h"
#include "lllistcontextmenu.h"
#include "llwearabletype.h"
@@ -462,7 +461,7 @@ public:
* Update items that match UUIDs from changed_items_uuids
* or links that point at such items.
*/
- void updateChangedItems(const LLInventoryModel::changed_items_t& changed_items_uuids);
+ void updateChangedItems(const uuid_vec_t& changed_items_uuids);
bool isStandalone() const { return mIsStandalone; }