merge release-QAR-499 Viewer 1.20 RC 3

merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release

5 files changed, 17 insertions, 2 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4829d5b893..f80028656e 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -923,6 +923,7 @@ void LLFloater::setFocus( BOOL b )
 	}
 }
 
+// virtual
 void LLFloater::setIsChrome(BOOL is_chrome)
 {
 	// chrome floaters don't take focus at all
@@ -941,6 +942,12 @@ void LLFloater::setIsChrome(BOOL is_chrome)
 	LLPanel::setIsChrome(is_chrome);
 }
 
+void LLFloater::setTitleVisible(bool visible)
+{
+	if (mDragHandle)
+		mDragHandle->setTitleVisible(visible);
+}
+
 // Change the draw style to account for the foreground state.
 void LLFloater::setForeground(BOOL front)
 {
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 280789d64c..4e8b86d2de 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -146,6 +146,7 @@ public:
 	const LLString&	getTitle() const;
 	void			setShortTitle( const LLString& short_title );
 	LLString		getShortTitle();
+	void			setTitleVisible(bool visible);
 	virtual void	setMinimized(BOOL b);
 	void			moveResizeHandlesToFront();
 	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE);
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 90659cdc70..2c4a5cbc58 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -501,6 +501,13 @@ void LLScrollbar::draw()
 	}
 	else
 	{
+		// Background
+		rounded_rect_imagep->drawSolid(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0, 
+			mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0,
+			mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(), 
+			mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
+			mTrackColor);
+
 		// Thumb
 		LLRect outline_rect = mThumbRect;
 		outline_rect.stretch(2);
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index d8df636abd..edad4c4d6b 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -430,7 +430,7 @@ void LLScrollableContainerView::draw()
 	if( mIsOpaque )
 	{
 		LLGLSNoTexture no_texture;
-		glColor4fv( mBackgroundColor.mV );
+		gGL.color4fv( mBackgroundColor.mV );
 		gl_rect_2d( mInnerRect );
 	}
 	
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index eb244a6f82..4e640eac2a 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1759,7 +1759,7 @@ void LLScrollListCtrl::draw()
 	if (mBackgroundVisible)
 	{
 		LLGLSNoTexture no_texture;
-		glColor4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
+		gGL.color4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
 		gl_rect_2d(background);
 	}