diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-19 16:17:33 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-19 16:17:33 -0400 |
| commit | 4ffc162492a3fe882af0899ba70e835c80367d09 (patch) | |
| tree | f1d942393c5a12f8c37458cae801f54b004168f2 /indra/newview/llappearancemgr.h | |
| parent | c62b6c46955a16af9ec16ff7e6bf9fb2c4b6e229 (diff) | |
SH-4263 FIX - added yet another level of callback kludgery to updateAppearanceFromCOF()
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rwxr-xr-x | indra/newview/llappearancemgr.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 9eb26767c4..a257f30ea5 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -51,7 +51,8 @@ public: void updateAppearanceFromCOF(bool update_base_outfit_ordering = false, bool enforce_item_restrictions = true, - bool enforce_ordering = true); + bool enforce_ordering = true, + nullary_func_t post_update_func = no_op); bool needToSaveCOF(); void updateCOF(const LLUUID& category, bool append = false); void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append); @@ -272,7 +273,8 @@ class LLUpdateAppearanceOnDestroy: public LLInventoryCallback public: LLUpdateAppearanceOnDestroy(bool update_base_outfit_ordering = false, bool enforce_item_restrictions = true, - bool enforce_ordering = true); + bool enforce_ordering = true, + nullary_func_t post_update_func = no_op); virtual ~LLUpdateAppearanceOnDestroy(); /* virtual */ void fire(const LLUUID& inv_item); @@ -281,6 +283,7 @@ private: bool mUpdateBaseOrder; bool mEnforceItemRestrictions; bool mEnforceOrdering; + nullary_func_t mPostUpdateFunc; }; class LLUpdateAppearanceAndEditWearableOnDestroy: public LLInventoryCallback |