From e77de5d685ae441f72920f0e04d9887ee958745a Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Wed, 14 May 2008 21:37:13 +0000 Subject: Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge . Passed QA as part of QAR-491. --- indra/llui/llfloater.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'indra/llui') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index b595845546..7bb79d4973 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -832,8 +832,14 @@ void LLFloater::setMinimized(BOOL minimize) for (S32 i = 0; i < 4; i++) { - if (mResizeBar[i]) mResizeBar[i]->setEnabled(FALSE); - if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(FALSE); + if (mResizeBar[i] != NULL) + { + mResizeBar[i]->setEnabled(FALSE); + } + if (mResizeHandle[i] != NULL) + { + mResizeHandle[i]->setEnabled(FALSE); + } } mMinimized = TRUE; @@ -875,8 +881,14 @@ void LLFloater::setMinimized(BOOL minimize) for (S32 i = 0; i < 4; i++) { - if (mResizeBar[i]) mResizeBar[i]->setEnabled(isResizable()); - if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(isResizable()); + if (mResizeBar[i] != NULL) + { + mResizeBar[i]->setEnabled(isResizable()); + } + if (mResizeHandle[i] != NULL) + { + mResizeHandle[i]->setEnabled(isResizable()); + } } mMinimized = FALSE; -- cgit v1.2.3