diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterpreference.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h index bf16d0d..ad4b3b8 100644 --- a/linden/indra/newview/llfloaterpreference.h +++ b/linden/indra/newview/llfloaterpreference.h | |||
@@ -45,8 +45,6 @@ class LLPanelGeneral; | |||
45 | class LLPanelInput; | 45 | class LLPanelInput; |
46 | class LLPanelLCD; | 46 | class LLPanelLCD; |
47 | class LLPanelDisplay; | 47 | class LLPanelDisplay; |
48 | class LLPanelDisplay2; | ||
49 | class LLPanelDisplay3; | ||
50 | class LLPanelAudioPrefs; | 48 | class LLPanelAudioPrefs; |
51 | class LLPanelDebug; | 49 | class LLPanelDebug; |
52 | class LLPanelNetwork; | 50 | class LLPanelNetwork; |
@@ -62,13 +60,13 @@ class LLPreferenceCore | |||
62 | { | 60 | { |
63 | 61 | ||
64 | public: | 62 | public: |
65 | LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton * default_btn); | 63 | LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn); |
66 | ~LLPreferenceCore(); | 64 | ~LLPreferenceCore(); |
67 | 65 | ||
68 | void apply(); | 66 | void apply(); |
69 | void cancel(); | 67 | void cancel(); |
70 | 68 | ||
71 | LLTabContainerCommon* getTabContainer() { return mTabContainer; } | 69 | LLTabContainer* getTabContainer() { return mTabContainer; } |
72 | 70 | ||
73 | void setPersonalInfo( | 71 | void setPersonalInfo( |
74 | const char* visibility, | 72 | const char* visibility, |
@@ -76,15 +74,16 @@ public: | |||
76 | const char* email); | 74 | const char* email); |
77 | 75 | ||
78 | static void onTabChanged(void* user_data, bool from_click); | 76 | static void onTabChanged(void* user_data, bool from_click); |
77 | |||
78 | // refresh all the graphics preferences menus | ||
79 | void refreshEnabledGraphics(); | ||
79 | 80 | ||
80 | private: | 81 | private: |
81 | LLTabContainerCommon *mTabContainer; | 82 | LLTabContainer *mTabContainer; |
82 | LLPanelGeneral *mGeneralPanel; | 83 | LLPanelGeneral *mGeneralPanel; |
83 | LLPanelInput *mInputPanel; | 84 | LLPanelInput *mInputPanel; |
84 | LLPanelNetwork *mNetworkPanel; | 85 | LLPanelNetwork *mNetworkPanel; |
85 | LLPanelDisplay *mDisplayPanel; | 86 | LLPanelDisplay *mDisplayPanel; |
86 | LLPanelDisplay2 *mDisplayPanel2; | ||
87 | LLPanelDisplay3 *mDisplayPanel3; | ||
88 | LLPanelAudioPrefs *mAudioPanel; | 87 | LLPanelAudioPrefs *mAudioPanel; |
89 | // LLPanelDebug *mDebugPanel; | 88 | // LLPanelDebug *mDebugPanel; |
90 | LLPrefsChat *mPrefsChat; | 89 | LLPrefsChat *mPrefsChat; |
@@ -113,6 +112,9 @@ public: | |||
113 | BOOL im_via_email, | 112 | BOOL im_via_email, |
114 | const char* email); | 113 | const char* email); |
115 | 114 | ||
115 | // refresh all the graphics preferences menus | ||
116 | static void refreshEnabledGraphics(); | ||
117 | |||
116 | protected: | 118 | protected: |
117 | LLPreferenceCore *mPreferenceCore; | 119 | LLPreferenceCore *mPreferenceCore; |
118 | 120 | ||