Second Life viewer sources 1.20.3

5 files changed, 17 insertions, 2 deletions

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 5142bf4..03914e2 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/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/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 8068741..7b4e003 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/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/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index cdabda0..8940b80 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/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/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index a6c1c6d..f0b0b81 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/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/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 2066819..32c4e82 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/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);
         }