merge from PE's viewer-release

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/newview/lloutfitobserver.h b/indra/newview/lloutfitobserver.h
index 4cb40ead15..a4b5fbe04a 100644
--- a/indra/newview/lloutfitobserver.h
+++ b/indra/newview/lloutfitobserver.h
@@ -48,6 +48,8 @@ public:
 
 	virtual void changed(U32 mask);
 
+	void notifyOutfitLockChanged() { mOutfitLockChanged();  }
+
 	typedef boost::signals2::signal<void (void)> signal_t;
 
 	void addBOFReplacedCallback(const signal_t::slot_type& cb) { mBOFReplaced.connect(cb); }
@@ -56,6 +58,10 @@ public:
 
 	void addCOFChangedCallback(const signal_t::slot_type& cb) { mCOFChanged.connect(cb); }
 
+	void addCOFSavedCallback(const signal_t::slot_type& cb) { mCOFSaved.connect(cb); }
+
+	void addOutfitLockChangedCallback(const signal_t::slot_type& cb) { mOutfitLockChanged.connect(cb); }
+
 protected:
 	LLOutfitObserver();
 
@@ -73,10 +79,18 @@ protected:
 
 	S32 mBaseOutfitLastVersion;
 
+	bool mLastOutfitDirtiness;
+
 private:
 	signal_t mBOFReplaced;
 	signal_t mBOFChanged;
 	signal_t mCOFChanged;
+	signal_t mCOFSaved;
+
+	/**
+	 * Signal for changing state of outfit lock.
+	 */
+	signal_t mOutfitLockChanged;
 };
 
 #endif /* LL_OUTFITOBSERVER_H */