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/llmorphview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index de4c6dcbd6..c1ae5e90d4 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -124,7 +124,7 @@ void LLMorphView::setVisible(BOOL visible)
 			llassert( !gFloaterCustomize );
 			gFloaterCustomize = new LLFloaterCustomize();
 			gFloaterCustomize->fetchInventory();
-			gFloaterCustomize->open();
+			gFloaterCustomize->open();	/*Flawfinder: ignore*/
 
 			// Must do this _after_ gFloaterView is initialized.
 			gFloaterCustomize->switchToDefaultSubpart();
-- 
cgit v1.3