SOCIAL-822 FIX UI and Sizing issues with hints in Basic and Advanced modes

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 97f0e36a0c..722d67caf9 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -192,7 +192,7 @@ BOOL LLHintPopup::postBuild()
 	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);
+//	hint_text.translate(0, -delta_height);
 	return TRUE;
 }
 
@@ -219,8 +219,10 @@ void LLHintPopup::draw()
 	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);
+	S32 delta_height = image_height - hint_icon.getParent()->getParent()->getRect().getHeight();
+	hint_icon.getParent()->reshape(image_width, hint_icon.getParent()->getRect().getHeight());
+	hint_icon.getParent()->getParent()->reshape(hint_icon.getParent()->getParent()->getRect().getWidth(), image_height);
+	hint_icon.getParent()->getParent()->translate(0, -delta_height);
 
 	LLRect hint_rect = getLocalRect();
 	reshape(hint_rect.getWidth(), hint_rect.getHeight() + delta_height);