From d85247e63e5ff0b488211b62429a4895b48dee27 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 17 Apr 2008 02:42:27 +0000
Subject: QAR-449 Viewer 1.20 RC 0 merge Branch_1-20-Viewer -r 84060 : 84432 ->
 release

---
 indra/llui/llcombobox.cpp | 6 ++++--
 indra/llui/llcombobox.h   | 2 ++
 indra/llui/llfloater.cpp  | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 62f2a6d319..0e8239cabd 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1113,15 +1113,17 @@ LLFlyoutButton::LLFlyoutButton(
 	mExpanderButtonImage = LLUI::getUIImage("flyout_btn_right.tga");
 	mActionButtonImageSelected = LLUI::getUIImage("flyout_btn_left_selected.tga");
 	mExpanderButtonImageSelected = LLUI::getUIImage("flyout_btn_right_selected.tga");
+	mActionButtonImageDisabled = LLUI::getUIImage("flyout_btn_left_disabled.tga");
+	mExpanderButtonImageDisabled = LLUI::getUIImage("flyout_btn_right_disabled.tga");
 
 	mActionButton->setImageSelected(mActionButtonImageSelected);
 	mActionButton->setImageUnselected(mActionButtonImage);
-	mActionButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+	mActionButton->setImageDisabled(mActionButtonImageDisabled);
 	mActionButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
 
 	mButton->setImageSelected(mExpanderButtonImageSelected);
 	mButton->setImageUnselected(mExpanderButtonImage);
-	mButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+	mButton->setImageDisabled(mExpanderButtonImageDisabled);
 	mButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
 	mButton->setRightHPad(6);
 
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index c4db52cc97..09e8a0e0f4 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -225,6 +225,8 @@ protected:
 	LLPointer<LLUIImage>	mExpanderButtonImage;
 	LLPointer<LLUIImage>	mActionButtonImageSelected;
 	LLPointer<LLUIImage>	mExpanderButtonImageSelected;
+	LLPointer<LLUIImage>	mActionButtonImageDisabled;
+	LLPointer<LLUIImage>	mExpanderButtonImageDisabled;
 	BOOL					mToggleState;
 };
 
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 1eb3d169a5..4829d5b893 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -832,8 +832,8 @@ void LLFloater::setMinimized(BOOL minimize)
 
 		for (S32 i = 0; i < 4; i++)
 		{
-			mResizeBar[i]->setEnabled(FALSE);
-			mResizeHandle[i]->setEnabled(FALSE);
+			if (mResizeBar[i]) mResizeBar[i]->setEnabled(FALSE);
+			if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(FALSE);
 		}
 
 		mMinimized = TRUE;
@@ -875,8 +875,8 @@ void LLFloater::setMinimized(BOOL minimize)
 
 		for (S32 i = 0; i < 4; i++)
 		{
-			mResizeBar[i]->setEnabled(isResizable());
-			mResizeHandle[i]->setEnabled(isResizable());
+			if (mResizeBar[i]) mResizeBar[i]->setEnabled(isResizable());
+			if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(isResizable());
 		}
 
 		mMinimized = FALSE;
-- 
cgit v1.2.3