From 2d19a2002501d44ce18080b6f26ceaf2dbf796e9 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 8 Sep 2011 09:46:04 -0500
Subject: add getInfo to LLView to get state information about ui elements.

---
 indra/llui/lluictrl.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lluictrl.h')

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 09bed9b958..8a8b589e9c 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -301,7 +301,9 @@ protected:
 
 	static F32 sActiveControlTransparency;
 	static F32 sInactiveControlTransparency;
-
+	
+	virtual void addInfo(LLSD & info);
+	
 private:
 
 	BOOL			mIsChrome;
-- 
cgit v1.2.3


From fdf042bdb9aeefa209694e04d4012a3a1f911a52 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 28 Sep 2011 16:54:34 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 FIX -- Populate the
 toybox floater window with all FUI toolbar buttons indicated as such in the
 "commands.xml" definition. EXP-1267 FIX -- Enable/disable buttons in the
 toybox

* Hooked up button callbacks to the toolbar buttons
* Fixed toybox button enable/disable to function properly and live update as
  buttons change states.
* Removed the toybox toolbar background image

Reviewed by Leyla
---
 indra/llui/lluictrl.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llui/lluictrl.h')

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 09bed9b958..fc56e5fc35 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -235,6 +235,9 @@ public:
 	// topic then put in help_topic_out
 	bool                    findHelpTopic(std::string& help_topic_out);
 
+	boost::signals2::connection setCommitCallback(const CommitCallbackParam& cb);
+	boost::signals2::connection setValidateCallback(const EnableCallbackParam& cb);
+
 	boost::signals2::connection setCommitCallback( const commit_signal_t::slot_type& cb );
 	boost::signals2::connection setValidateCallback( const enable_signal_t::slot_type& cb );
 
-- 
cgit v1.2.3


From 09e179b2381a4db03309839babae664feb9b0886 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 30 Sep 2011 16:57:08 -0700
Subject: param block cleanup added Flag as value type moved Batch to
 BatchBlock renamed Choice to ChoiceBlock made merging of parameters for
 ValueParams consistent (fillFrom and overwriteFrom are inverses of each other
 now) made iteration over Multiple<T> type params easier initial schema param
 blocks

---
 indra/llui/lluictrl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llui/lluictrl.h')

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index fc56e5fc35..a8a4e3191d 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -76,14 +76,14 @@ public:
 		Optional<enable_callback_t> function;
 	};
 		
-	struct EnableControls : public LLInitParam::Choice<EnableControls>
+	struct EnableControls : public LLInitParam::ChoiceBlock<EnableControls>
 	{
 		Alternative<std::string> enabled;
 		Alternative<std::string> disabled;
 		
 		EnableControls();
 	};	
-	struct ControlVisibility : public LLInitParam::Choice<ControlVisibility>
+	struct ControlVisibility : public LLInitParam::ChoiceBlock<ControlVisibility>
 	{
 		Alternative<std::string> visible;
 		Alternative<std::string> invisible;
-- 
cgit v1.2.3


From b6858df0dd9fa06ec8fa56c5ba63925a790b4811 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Nov 2011 13:47:08 -0800
Subject: LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and
 LLHandle<Base> can be downcast to LLHandle<Derived> using the
 LLHandleProvider mixin

---
 indra/llui/lluictrl.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llui/lluictrl.h')

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 3e055a9d06..fb2196bb16 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -223,7 +223,7 @@ public:
 	BOOL	focusLastItem(BOOL prefer_text_fields = FALSE);
 
 	// Non Virtuals
-	LLHandle<LLUICtrl> getUICtrlHandle() const { return mUICtrlHandle; }
+	LLHandle<LLUICtrl> getHandle() const { return getDerivedHandle<LLUICtrl>(); }
 	BOOL			getIsChrome() const;
 	
 	void			setTabStop( BOOL b );
@@ -313,7 +313,6 @@ private:
 	BOOL			mRequestsFront;
 	BOOL			mTabStop;
 	BOOL			mTentative;
-	LLRootHandle<LLUICtrl> mUICtrlHandle;
 
 	ETypeTransparency mTransparencyType;
 
-- 
cgit v1.2.3