From f8d08af9f1e810c977626e4131baf771d2b3655c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 23 Nov 2010 16:25:10 -0800
Subject: SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
 converted LLLayoutStack orientation param to use named enums

---
 indra/llui/lllayoutstack.h | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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

diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index e19ef403ef..9e8539c716 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -37,12 +37,24 @@ class LLLayoutPanel;
 class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack>
 {
 public:
+	typedef enum e_layout_orientation
+	{
+		HORIZONTAL,
+		VERTICAL
+	} ELayoutOrientation;
+
+	struct OrientationNames
+	:	public LLInitParam::TypeValuesHelper<ELayoutOrientation, OrientationNames>
+	{
+		static void declareValues();
+	};
+
 	struct LayoutStackRegistry : public LLChildRegistry<LayoutStackRegistry>
 	{};
 
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
 	{
-		Mandatory<std::string>	orientation;
+		Mandatory<ELayoutOrientation, OrientationNames>	orientation;
 		Optional<S32>			border_size;
 		Optional<bool>			animate,
 								clip;
@@ -52,12 +64,6 @@ public:
 
 	typedef LayoutStackRegistry child_registry_t;
 
-	typedef enum e_layout_orientation
-	{
-		HORIZONTAL,
-		VERTICAL
-	} ELayoutOrientation;
-
 	virtual ~LLLayoutStack();
 
 	/*virtual*/ void draw();
-- 
cgit v1.2.3


From 8044661bd581fd7b6a25bd04d4c4f7e32e421faf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 10 Dec 2010 10:11:03 -0800
Subject: WIP XUI HTTP Auth dialog refactored LLWindowShade into seperate file
 improved layout of dialog improved dialog resizing logic Tab and Enter keys
 now work as expected in windowshade form added "modal" capability to window
 shade added HTTP Auth notifications to MOAP

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

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

diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 9e8539c716..e43669d893 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -173,6 +173,9 @@ public:
 	~LLLayoutPanel();
 
 	void initFromParams(const Params& p);
+	void setMinDim(S32 value) { mMinDim = value; }
+	void setMaxDim(S32 value) { mMaxDim = value; }
+
 protected:
 	LLLayoutPanel(const Params& p)	;
 
-- 
cgit v1.2.3