From f023c677782168cdd48af8e897900f0dfef9fba8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 18 Mar 2014 14:05:41 -0500
Subject: MAINT-3832 Make color pickers actually apply result immediately when
 "apply immediately" is checked.

---
 indra/newview/llcolorswatch.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llcolorswatch.h')

diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h
index 5bdd1712d2..b3b6cfe32d 100755
--- a/indra/newview/llcolorswatch.h
+++ b/indra/newview/llcolorswatch.h
@@ -59,6 +59,7 @@ public:
 		Optional<LLUIImage*>			alpha_background_image;
 		Optional<commit_callback_t> 	cancel_callback;
 		Optional<commit_callback_t> 	select_callback;
+		Optional<commit_callback_t>		preview_callback;
 		Optional<LLUIColor>				border_color;
 		Optional<S32>					label_width;
 		Optional<S32>					label_height;
@@ -87,6 +88,7 @@ public:
 	void			setCanApplyImmediately(BOOL apply) { mCanApplyImmediately = apply; }
 	void			setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; }
 	void			setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; }
+	void			setPreviewCallback(commit_callback_t cb) { mPreviewCallback = cb; }
 	void			setFallbackImageName(const std::string& name) { mFallbackImageName = name; }
 
 	void			showPicker(BOOL take_focus);
@@ -112,6 +114,7 @@ protected:
 	BOOL			mCanApplyImmediately;
 	commit_callback_t mOnCancelCallback;
 	commit_callback_t mOnSelectCallback;
+	commit_callback_t mPreviewCallback;
 	S32             mLabelWidth;
 	S32             mLabelHeight;
 
-- 
cgit v1.2.3