diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2014-05-19 14:44:01 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2014-05-19 14:44:01 -0400 |
| commit | d0d32626a5bf25f76b4a3296f681eb13e071d55e (patch) | |
| tree | a89867a31e5b40dd6c2e3e0491e01ded8b9d18d7 /indra/newview | |
| parent | a5bb8839fa24fa0b7da331f14eedccea1b44bc84 (diff) | |
merge fix for merge with project interesting. New appearance utility source and one quick doubly-declared typedef.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llinventorymodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
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: |