STORM-2145 Merge up to viewer-release

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8c7df45884..510a2537b9 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -808,11 +808,12 @@ void LLButton::draw()
 		}
 		else
 		{
-			imagep->draw(0, 0, (enabled ? mImageColor.get() : disabled_color) % alpha );
+			S32 y = getLocalRect().getHeight() - imagep->getHeight();
+			imagep->draw(0, y, (enabled ? mImageColor.get() : disabled_color) % alpha);
 			if (mCurGlowStrength > 0.01f)
 			{
 				gGL.setSceneBlendType(glow_type);
-				imagep->drawSolid(0, 0, glow_color % (mCurGlowStrength * alpha));
+				imagep->drawSolid(0, y, glow_color % (mCurGlowStrength * alpha));
 				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
@@ -954,7 +955,8 @@ void LLButton::drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size)
 	}
 	else
 	{
-		imagep->drawBorder(0, 0, color, size);
+		S32 y = getLocalRect().getHeight() - imagep->getHeight();
+		imagep->drawBorder(0, y, color, size);
 	}
 }