From f5e386527c4a74e6e5733f4f1cfa55873851257e Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 4 Apr 2008 01:22:03 +0000
Subject: QAR-427 merge 3dconnex-merge -r 84010 : 84039 -> release

---
 indra/llui/llfloater.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'indra/llui')

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()
-- 
cgit v1.2.3