summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-09 17:13:54 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-09 17:13:54 +0200
commit41f350cee9acfc108eba68f83bf44bf5861814df (patch)
treea06ac2169a6e95b84d501023915695a17b3066f6
parentac5bd9d50410106549e1aad922e609707f08deab (diff)
Fixed normal bug EXT-5244 ( There is no "i" button for Name fields from nearby chat)
- reason: changes in c91e724d4f15 related to EXT-4547. Also multiple warnings appeared in log: LLView::getChild: Found child named user_name but of wrong type class L LTextBox, expecting class LLViewerTextEditor * - fix: changed template class from LLViewerTextEditor to LLTextBase in getChild. --HG-- branch : product-engine
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 929457046c..c125f84c58 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -116,7 +116,7 @@ public:
//*TODO remake it using mouse enter/leave and static LLHandle<LLIconCtrl> to add/remove as a child
BOOL handleToolTip(S32 x, S32 y, MASK mask)
{
- LLViewerTextEditor* name = getChild<LLViewerTextEditor>("user_name");
+ LLTextBase* name = getChild<LLTextBase>("user_name");
if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom)
{