4 files changed, 24 insertions, 0 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 6521b883f8..2a221fc19c 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -220,6 +220,7 @@ LLTabContainer::Params::Params()
 	last_tab("last_tab"),
 	use_custom_icon_ctrl("use_custom_icon_ctrl", false),
 	open_tabs_on_drag_and_drop("open_tabs_on_drag_and_drop", false),
+	enable_tabs_flashing("enable_tabs_flashing", false),
 	tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0),
 	use_ellipses("use_ellipses"),
 	font_halign("halign")
@@ -1102,6 +1103,9 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 		    p.pad_left( mLabelPadLeft );
 		    p.pad_right(2);
 		}
+
+		// inits flash timer
+		p.button_flash_enable = mEnableTabsFlashing;
 		
 		// *TODO : It seems wrong not to use p in both cases considering the way p is initialized
 		if (mCustomIconCtrlUsed)
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 6bf963313c..8f93f1c47d 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -109,6 +109,11 @@ public:
 		 * Open tabs on hover in drag and drop situations
 		 */
 		Optional<bool>						open_tabs_on_drag_and_drop;
+
+		/**
+		 * Open tabs on hover in drag and drop situations
+		 */
+		Optional<bool>						enable_tabs_flashing;
 		
 		/**
 		 *  Paddings for LLIconCtrl in case of LLCustomButtonIconCtrl usage(use_custom_icon_ctrl = true)
@@ -310,6 +315,7 @@ private:
 
 	bool							mCustomIconCtrlUsed;
 	bool							mOpenTabsOnDragAndDrop;
+	bool							mEnableTabsFlashing;
 	S32								mTabIconCtrlPad;
 	bool							mUseTabEllipses;
 };
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index a23741b6dd..4505e3d572 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2226,6 +2226,18 @@ void LLTextBase::needsReflow(S32 index)
 	mReflowIndex = llmin(mReflowIndex, index);
 }
 
+S32	LLTextBase::removeFirstLine()
+{
+    if (!mLineInfoList.empty())
+    {
+        S32 length = getLineEnd(0);
+        deselect();
+        removeStringNoUndo(0, length);
+        return length;
+    }
+    return 0;
+}
+
 void LLTextBase::appendLineBreakSegment(const LLStyle::Params& style_params)
 {
 	segment_vec_t segments;
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 9831c35858..bb9e864c0c 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -402,6 +402,7 @@ public:
 	virtual void			setText(const LLStringExplicit &utf8str , const LLStyle::Params& input_params = LLStyle::Params()); // uses default style
 	virtual std::string		getText() const;
 	void					setMaxTextLength(S32 length) { mMaxTextByteLength = length; }
+	S32						getMaxTextLength() { return mMaxTextByteLength; }
 
 	// wide-char versions
 	void					setWText(const LLWString& text);
@@ -430,6 +431,7 @@ public:
 
 	S32						getLength() const { return getWText().length(); }
 	S32						getLineCount() const { return mLineInfoList.size(); }
+	S32						removeFirstLine(); // returns removed length
 
 	void					addDocumentChild(LLView* view);
 	void					removeDocumentChild(LLView* view);