From 305c74d5163c5e344a675d39ca2394a9e45bd2c2 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 2 Feb 2007 17:28:58 +0000
Subject: Result of svn merge -r57264:57370
 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

---
 indra/newview/llfloaterchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 3d8912d001..93eb24f36d 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -116,7 +116,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 // public
 void LLFloaterChat::show()
 {
-	open();
+	open();		/*Flawfinder: ignore*/
 }
 
 void add_timestamped_line(LLViewerTextEditor* edit, const LLString& line, const LLColor4& color)
-- 
cgit v1.3