From d0d32626a5bf25f76b4a3296f681eb13e071d55e Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Mon, 19 May 2014 14:44:01 -0400 Subject: merge fix for merge with project interesting. New appearance utility source and one quick doubly-declared typedef. --- indra/newview/llinventorymodel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index b72c8fed50..2e957809be 100755 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -485,7 +485,7 @@ public: // been changed 'under the hood', but outside the control of the // inventory. The next notify will include that notification. void addChangedMask(U32 mask, const LLUUID& referent); - typedef uuid_set_t changed_items_t; + const changed_items_t& getChangedIDs() const { return mChangedItemIDs; } const changed_items_t& getAddedIDs() const { return mAddedItemIDs; } protected: -- cgit v1.2.3