diff options
author | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
commit | fd2ccb16068dfd21307b17e78e384d8ae19fef12 (patch) | |
tree | 3e40dcddd3117820008047b81ec218e9cc0ffb7c /indra/newview/llappearancemgr.h | |
parent | 8baf88a073f30d217e03ee56b4a255121ac98071 (diff) | |
parent | ecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff) |
merge changes for 4.1.2-release
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rw-r--r-- | indra/newview/llappearancemgr.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 2e570b9188..f0d3f80f59 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -229,6 +229,10 @@ public: void setAppearanceServiceURL(const std::string& url) { mAppearanceServiceURL = url; } std::string getAppearanceServiceURL() const; + typedef boost::function<void ()> attachments_changed_callback_t; + typedef boost::signals2::signal<void ()> attachments_changed_signal_t; + boost::signals2::connection setAttachmentsChangedCallback(attachments_changed_callback_t cb); + private: @@ -272,6 +276,8 @@ private: LLTimer mInFlightTimer; static bool mActive; + attachments_changed_signal_t mAttachmentsChangeSignal; + LLUUID mCOFImageID; std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer; |