diff options
author | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:56 -0500 |
commit | c07901e29ed545bbb02e3bddf148fe1104b94e9f (patch) | |
tree | f1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/newview/llfloaterpreference.cpp | |
parent | Second Life viewer sources 1.15.0.2 (diff) | |
download | meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2 meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz |
Second Life viewer sources 1.15.1.3
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterpreference.cpp | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp index dceadf9..963c268 100644 --- a/linden/indra/newview/llfloaterpreference.cpp +++ b/linden/indra/newview/llfloaterpreference.cpp | |||
@@ -156,6 +156,66 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton | |||
156 | // addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this); | 156 | // addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this); |
157 | } | 157 | } |
158 | 158 | ||
159 | LLPreferenceCore::~LLPreferenceCore() | ||
160 | { | ||
161 | if (mGeneralPanel) | ||
162 | { | ||
163 | delete mGeneralPanel; | ||
164 | mGeneralPanel = NULL; | ||
165 | } | ||
166 | if (mInputPanel) | ||
167 | { | ||
168 | delete mInputPanel; | ||
169 | mInputPanel = NULL; | ||
170 | } | ||
171 | if (mNetworkPanel) | ||
172 | { | ||
173 | delete mNetworkPanel; | ||
174 | mNetworkPanel = NULL; | ||
175 | } | ||
176 | if (mDisplayPanel) | ||
177 | { | ||
178 | delete mDisplayPanel; | ||
179 | mDisplayPanel = NULL; | ||
180 | } | ||
181 | if (mDisplayPanel2) | ||
182 | { | ||
183 | delete mDisplayPanel2; | ||
184 | mDisplayPanel2 = NULL; | ||
185 | } | ||
186 | if (mDisplayPanel3) | ||
187 | { | ||
188 | delete mDisplayPanel3; | ||
189 | mDisplayPanel3 = NULL; | ||
190 | } | ||
191 | if (mAudioPanel) | ||
192 | { | ||
193 | delete mAudioPanel; | ||
194 | mAudioPanel = NULL; | ||
195 | } | ||
196 | if (mPrefsChat) | ||
197 | { | ||
198 | delete mPrefsChat; | ||
199 | mPrefsChat = NULL; | ||
200 | } | ||
201 | if (mPrefsIM) | ||
202 | { | ||
203 | delete mPrefsIM; | ||
204 | mPrefsIM = NULL; | ||
205 | } | ||
206 | if (mMsgPanel) | ||
207 | { | ||
208 | delete mMsgPanel; | ||
209 | mMsgPanel = NULL; | ||
210 | } | ||
211 | //if (mWebPanel) | ||
212 | //{ | ||
213 | // delete mWebPanel; | ||
214 | // mWebPanel = NULL; | ||
215 | //} | ||
216 | } | ||
217 | |||
218 | |||
159 | void LLPreferenceCore::apply() | 219 | void LLPreferenceCore::apply() |
160 | { | 220 | { |
161 | mGeneralPanel->apply(); | 221 | mGeneralPanel->apply(); |