fixed regressions from changing layout panel to be a derived widget class

3 files changed, 15 insertions, 6 deletions

diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 00fb276f19..f87534fa76 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -91,10 +91,10 @@ public:
 
 		Optional<bool>			selection_enabled;
 
-		Optional<S32>			padding_left;
-		Optional<S32>			padding_right;
-		Optional<S32>			padding_top;
-		Optional<S32>			padding_bottom;
+		Optional<S32>			padding_left,
+								padding_right,
+								padding_top,
+								padding_bottom;
 
 		Params();
 	};
@@ -176,7 +176,7 @@ public:
 	virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
 
 
-	virtual bool addChild(LLView* child, S32 tab_group);
+	virtual bool addChild(LLView* child, S32 tab_group = 0 );
 
 	bool isExpanded() const { return mDisplayChildren; }
 
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 92c8416cbc..15a0369eb9 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -65,6 +65,13 @@ LLLayoutPanel::LLLayoutPanel(const Params& p)
 	}
 }
 
+void LLLayoutPanel::initFromParams(const Params& p)
+{
+	LLPanel::initFromParams(p);
+	setFollowsNone();
+}
+
+
 LLLayoutPanel::~LLLayoutPanel()
 {
 	// probably not necessary, but...
@@ -663,7 +670,7 @@ void LLLayoutStack::createResizeBars()
 
 			LLResizeBar::Params resize_params;
 			resize_params.name("resize");
-			resize_params.resizing_view(this);
+			resize_params.resizing_view(lp);
 			resize_params.min_size(lp->mMinDim);
 			resize_params.side(side);
 			resize_params.snapping_enabled(false);
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index cc5bd6cf65..9bcfa2c957 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -166,6 +166,8 @@ public:
 	};
 
 	~LLLayoutPanel();
+
+	void initFromParams(const Params& p);
 protected:
 	LLLayoutPanel(const Params& p)	;