From 453b0c700a8712f7ff79434772296a487d38184a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 1 Apr 2011 16:42:30 -0700
Subject: [PATCH] SOCIAL-822 FIX UI and Sizing issues with hints in Basic and
Advanced modes fixed crash for advanced mode
---
indra/newview/llhints.cpp | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 722d67caf9b..b5e676e6260 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -213,19 +213,22 @@ void LLHintPopup::draw()
alpha = clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, mFadeInTime, 0.f, 1.f);
}
- LLIconCtrl& hint_icon = getChildRef<LLIconCtrl>("hint_image");
+ LLIconCtrl* hint_icon = findChild<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();
+ if (hint_icon)
+ {
+ 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.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);
+ 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);
+ LLRect hint_rect = getLocalRect();
+ reshape(hint_rect.getWidth(), hint_rect.getHeight() + delta_height);
+ }
{ LLViewDrawContext context(alpha);
--
GitLab