From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Tue, 21 Aug 2007 22:17:53 +0000 Subject: EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release --- indra/llui/llfloater.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/llui/llfloater.cpp') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 17b4dffa3f..9ea4165ea4 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1232,10 +1232,13 @@ BOOL LLFloater::getEditModeEnabled() //static void LLFloater::show(LLFloater* floaterp) { - if (floaterp) floaterp->open(); - if (floaterp->getHost()) + if (floaterp) { - floaterp->getHost()->open(); + floaterp->open(); + if (floaterp->getHost()) + { + floaterp->getHost()->open(); + } } } -- cgit v1.3