diff options
Diffstat (limited to 'linden/indra/newview/llpaneldisplay.h')
-rw-r--r-- | linden/indra/newview/llpaneldisplay.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h index d7727e7..e64e9ba 100644 --- a/linden/indra/newview/llpaneldisplay.h +++ b/linden/indra/newview/llpaneldisplay.h | |||
@@ -113,14 +113,13 @@ protected: | |||
113 | LLCheckBoxCtrl *mCtrlShaderEnable; | 113 | LLCheckBoxCtrl *mCtrlShaderEnable; |
114 | LLCheckBoxCtrl *mCtrlAvatarImpostors; | 114 | LLCheckBoxCtrl *mCtrlAvatarImpostors; |
115 | LLCheckBoxCtrl *mCtrlAvatarCloth; | 115 | LLCheckBoxCtrl *mCtrlAvatarCloth; |
116 | LLRadioGroup *mRadioLightingDetail2; | 116 | LLComboBox *mComboLightingDetail; |
117 | 117 | ||
118 | LLRadioGroup *mRadioTerrainDetail; | 118 | LLComboBox *mComboTerrainDetail; |
119 | LLRadioGroup *mRadioReflectionDetail; | 119 | LLComboBox *mComboReflectionDetail; |
120 | 120 | ||
121 | LLTextBox *mAspectRatioLabel1; | 121 | LLTextBox *mAspectRatioLabel1; |
122 | LLTextBox *mDisplayResLabel; | 122 | LLTextBox *mDisplayResLabel; |
123 | LLTextEditor *mFullScreenInfo; | ||
124 | LLTextBox *mWindowSizeLabel; | 123 | LLTextBox *mWindowSizeLabel; |
125 | 124 | ||
126 | LLTextBox *mShaderText; | 125 | LLTextBox *mShaderText; |
@@ -137,7 +136,7 @@ protected: | |||
137 | LLTextBox *mTerrainFactorText; | 136 | LLTextBox *mTerrainFactorText; |
138 | LLTextBox *mSkyFactorText; | 137 | LLTextBox *mSkyFactorText; |
139 | LLTextBox *mPostProcessText; | 138 | LLTextBox *mPostProcessText; |
140 | LLTextBox *mAvatarCountText; | 139 | LLTextBox *mLimitsText; |
141 | 140 | ||
142 | BOOL mFSAutoDetectAspect; | 141 | BOOL mFSAutoDetectAspect; |
143 | F32 mAspectRatio; | 142 | F32 mAspectRatio; |
@@ -173,8 +172,6 @@ protected: | |||
173 | 172 | ||
174 | S32 mAvatarMaxVisible; | 173 | S32 mAvatarMaxVisible; |
175 | 174 | ||
176 | BOOL mWLControl; | ||
177 | |||
178 | static void setGraphicsSettings(LLControlGroup& group); | 175 | static void setGraphicsSettings(LLControlGroup& group); |
179 | static void createGroup(); | 176 | static void createGroup(); |
180 | 177 | ||