Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index c4dcaf11f9..97f0e36a0c 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -191,6 +191,8 @@ BOOL LLHintPopup::postBuild()
 	LLRect text_bounds = hint_text.getTextBoundingRect();
 	S32 delta_height = text_bounds.getHeight() - hint_text.getRect().getHeight();
 	reshape(getRect().getWidth(), getRect().getHeight() + delta_height);
+	hint_text.reshape(hint_text.getRect().getWidth(), hint_text.getRect().getHeight() + delta_height);
+	hint_text.translate(0, -delta_height);
 	return TRUE;
 }
 
@@ -211,6 +213,18 @@ void LLHintPopup::draw()
 		alpha = clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, mFadeInTime, 0.f, 1.f);
 	}
 	
+	LLIconCtrl& hint_icon = getChildRef<LLIconCtrl>("hint_image");
+
+	LLUIImagePtr hint_image = hint_icon.getImage();
+	S32 image_height = hint_image.isNull() ? 0 : hint_image->getHeight();
+	S32 image_width = hint_image.isNull() ? 0 : hint_image->getWidth();
+
+	S32 delta_height = image_height - hint_icon.getRect().getHeight();
+	hint_icon.getParent()->reshape(image_width, image_height);
+
+	LLRect hint_rect = getLocalRect();
+	reshape(hint_rect.getWidth(), hint_rect.getHeight() + delta_height);
+
 	{	LLViewDrawContext context(alpha); 
 
 		if (mTarget.empty())