Merge pull request #5852 from secondlife/marchcat/slua-26.2

26.2 -> SLua viewer

1 files changed, 13 insertions, 5 deletions

diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 97d2345778..ce236dec66 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -200,13 +200,14 @@ void LLColorSwatchCtrl::draw()
     F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
 
     mBorder->setKeyboardFocusHighlight(hasFocus());
-    // Draw border
-    LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight );
-    gl_rect_2d( border, mBorderColor.get(), false );
 
-    LLRect interior = border;
+    LLRect gl_border(0, getRect().getHeight(), getRect().getWidth(), mLabelHeight);
+    LLColor4 gl_border_color = mBorderColor.get();
+    LLRect interior = gl_border;
     interior.stretch( -1 );
 
+    bool show_border_ctrl = true;
+
     // Check state
     if ( mValid )
     {
@@ -239,7 +240,9 @@ void LLColorSwatchCtrl::draw()
     {
         if (mFallbackImage.notNull())
         {
-            mFallbackImage->draw(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), LLColor4::white % alpha);
+            mFallbackImage->draw(interior.mLeft - 1, interior.mBottom - 1, mFallbackImage->getWidth(), mFallbackImage->getHeight(), LLColor4::white % alpha);
+            gl_border_color = LLUIColorTable::instance().getColor("ColorSwatchBorderColorGray").get();
+            show_border_ctrl = false;
         }
         else
         {
@@ -250,6 +253,11 @@ void LLColorSwatchCtrl::draw()
         }
     }
 
+    mBorder->setVisible(show_border_ctrl);
+
+    // Draw border
+    gl_rect_2d(gl_border, gl_border_color, false);
+
     LLUICtrl::draw();
 }