diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-04 01:22:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-04 01:22:03 +0000 |
| commit | f5e386527c4a74e6e5733f4f1cfa55873851257e (patch) | |
| tree | 9973027da0faa63a628aa6a55b2e50a3f7fc74d9 /indra/llui | |
| parent | 96add52a1c414bae4da030c3ab8604f15bd9c8db (diff) | |
QAR-427
merge 3dconnex-merge -r 84010 : 84039 -> release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index b69ac30e9c..1eb3d169a5 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -656,7 +656,8 @@ void LLFloater::setTitle( const LLString& title ) { return; } - mDragHandle->setTitle( title ); + if (mDragHandle) + mDragHandle->setTitle( title ); } const LLString& LLFloater::getTitle() const @@ -934,7 +935,8 @@ void LLFloater::setIsChrome(BOOL is_chrome) } // no titles displayed on "chrome" floaters - mDragHandle->setTitleVisible(!is_chrome); + if (mDragHandle) + mDragHandle->setTitleVisible(!is_chrome); LLPanel::setIsChrome(is_chrome); } @@ -945,7 +947,8 @@ void LLFloater::setForeground(BOOL front) if (front != mForeground) { mForeground = front; - mDragHandle->setForeground( front ); + if (mDragHandle) + mDragHandle->setForeground( front ); if (!front) { @@ -1580,8 +1583,8 @@ void LLFloater::updateButtons() mButtons[i]->setVisible(FALSE); } } - - mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (LLFLOATER_CLOSE_BOX_SIZE + 1))); + if (mDragHandle) + mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (LLFLOATER_CLOSE_BOX_SIZE + 1))); } void LLFloater::buildButtons() |