From 73caee4208a4e05f66583de099502012fd8415ea Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 14 Aug 2009 21:50:02 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 ->
 viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342
 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414
 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496

---
 indra/newview/llchatitemscontainerctrl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llchatitemscontainerctrl.cpp')

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index a63477a442..45b322e106 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -246,7 +246,9 @@ void	LLChatItemCtrl::setHeaderVisibility(EShowItemHeader e)
 
 bool	LLChatItemCtrl::canAddText	()
 {
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
+	LLChatMsgBox* msg_text = findChild<LLChatMsgBox>("msg_text");
+	if(!msg_text)
+		return false;
 	return msg_text->getTextLinesNum()<10;
 }
 
-- 
cgit v1.2.3