Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 21 insertions, 23 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index cac2d0a0b6..584d7479e4 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -73,6 +73,7 @@
 #include "llviewerwindow.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
+#include "llfloaterhardwaresettings.h"
 
 #if LL_WINDOWS
 // for Logitech LCD keyboards / speakers
@@ -133,7 +134,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mInputPanel(NULL),
 	mNetworkPanel(NULL),
 	mDisplayPanel(NULL),
-	mDisplayPanel2(NULL),
 	mAudioPanel(NULL),
 	mMsgPanel(NULL),
 	mLCDPanel(NULL)
@@ -158,14 +158,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
 	mDisplayPanel->setDefaultBtn(default_btn);
 
-	mDisplayPanel3 = new LLPanelDisplay3();
-	mTabContainer->addTabPanel(mDisplayPanel3, mDisplayPanel3->getLabel(), FALSE, onTabChanged, mTabContainer);
-	mDisplayPanel3->setDefaultBtn(default_btn);
-
-	mDisplayPanel2 = new LLPanelDisplay2();
-	mTabContainer->addTabPanel(mDisplayPanel2, mDisplayPanel2->getLabel(), FALSE, onTabChanged, mTabContainer);
-	mDisplayPanel2->setDefaultBtn(default_btn);
-
 	mAudioPanel = new LLPanelAudioPrefs();
 	mTabContainer->addTabPanel(mAudioPanel, mAudioPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
 	mAudioPanel->setDefaultBtn(default_btn);
@@ -225,16 +217,7 @@ LLPreferenceCore::~LLPreferenceCore()
 		delete mDisplayPanel;
 		mDisplayPanel = NULL;
 	}
-	if (mDisplayPanel2)
-	{
-		delete mDisplayPanel2;
-		mDisplayPanel2 = NULL;
-	}
-	if (mDisplayPanel3)
-	{
-		delete mDisplayPanel3;
-		mDisplayPanel3 = NULL;
-	}
+
 	if (mAudioPanel)
 	{
 		delete mAudioPanel;
@@ -269,12 +252,14 @@ void LLPreferenceCore::apply()
 	mInputPanel->apply();
 	mNetworkPanel->apply();
 	mDisplayPanel->apply();
-	mDisplayPanel2->apply();
-	mDisplayPanel3->apply();
 	mPrefsChat->apply();
 	mPrefsVoice->apply();
 	mPrefsIM->apply();
 	mMsgPanel->apply();
+
+	// hardware menu apply
+	LLFloaterHardwareSettings::instance()->apply();
+
 	mWebPanel->apply();
 #if LL_WINDOWS && LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
@@ -293,13 +278,15 @@ void LLPreferenceCore::cancel()
 	mInputPanel->cancel();
 	mNetworkPanel->cancel();
 	mDisplayPanel->cancel();
-	mDisplayPanel2->cancel();
-	mDisplayPanel3->cancel();
 	mAudioPanel->cancel();
 	mPrefsChat->cancel();
 	mPrefsVoice->cancel();
 	mPrefsIM->cancel();
 	mMsgPanel->cancel();
+
+	// cancel hardware menu
+	LLFloaterHardwareSettings::instance()->cancel();
+
 	mWebPanel->cancel();
 #if LL_WINDOWS && LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
@@ -328,6 +315,12 @@ void LLPreferenceCore::setPersonalInfo(
 	mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
 }
 
+void LLPreferenceCore::refreshEnabledGraphics()
+{
+	LLFloaterHardwareSettings::instance()->refreshEnabledState();
+	mDisplayPanel->refreshEnabledState();
+}
+
 //////////////////////////////////////////////
 // LLFloaterPreference
 
@@ -521,3 +514,8 @@ void LLFloaterPreference::updateUserInfo(
 			visibility, im_via_email, email);
 	}
 }
+
+void LLFloaterPreference::refreshEnabledGraphics()
+{
+	sInstance->mPreferenceCore->refreshEnabledGraphics();
+}