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, 6 insertions, 4 deletions

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 7396467d8c..52592c0bad 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -45,8 +45,6 @@ class LLPanelGeneral;
 class LLPanelInput;
 class LLPanelLCD;
 class LLPanelDisplay;
-class LLPanelDisplay2;
-class LLPanelDisplay3;
 class LLPanelAudioPrefs;
 class LLPanelDebug;
 class LLPanelNetwork;
@@ -76,6 +74,9 @@ public:
 		const char* email);
 
 	static void onTabChanged(void* user_data, bool from_click);
+	
+	// refresh all the graphics preferences menus
+	void refreshEnabledGraphics();
 
 private:
 	LLTabContainer	*mTabContainer;
@@ -83,8 +84,6 @@ private:
 	LLPanelInput			*mInputPanel;
 	LLPanelNetwork	        *mNetworkPanel;
 	LLPanelDisplay	        *mDisplayPanel;
-	LLPanelDisplay2			*mDisplayPanel2;
-	LLPanelDisplay3			*mDisplayPanel3;
 	LLPanelAudioPrefs		*mAudioPanel;
 //	LLPanelDebug			*mDebugPanel;
 	LLPrefsChat				*mPrefsChat;
@@ -113,6 +112,9 @@ public:
 		BOOL im_via_email,
 		const char* email);
 
+	// refresh all the graphics preferences menus
+	static void refreshEnabledGraphics();
+
 protected:
 	LLPreferenceCore		*mPreferenceCore;