diff options
author | McCabe Maxsted | 2010-11-05 17:17:56 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-11-05 17:17:56 -0700 |
commit | cff602ecc9984ccd973f6bfe3521ceb0a1270b31 (patch) | |
tree | fd3d846b17c23db480e820e8e99f6622638761fd /linden/indra | |
parent | Renamed several preferences panels: (diff) | |
download | meta-impy-cff602ecc9984ccd973f6bfe3521ceb0a1270b31.zip meta-impy-cff602ecc9984ccd973f6bfe3521ceb0a1270b31.tar.gz meta-impy-cff602ecc9984ccd973f6bfe3521ceb0a1270b31.tar.bz2 meta-impy-cff602ecc9984ccd973f6bfe3521ceb0a1270b31.tar.xz |
Changed the order of the chat/im/voice preferences panels to include chat colors more logically
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llfloaterpreference.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp index 906cf11..2fe4b4d 100644 --- a/linden/indra/newview/llfloaterpreference.cpp +++ b/linden/indra/newview/llfloaterpreference.cpp | |||
@@ -167,13 +167,18 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def | |||
167 | mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); | 167 | mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); |
168 | mPrefsChat->getPanel()->setDefaultBtn(default_btn); | 168 | mPrefsChat->getPanel()->setDefaultBtn(default_btn); |
169 | 169 | ||
170 | mPrefsVoice = new LLPrefsVoice(); | 170 | mPrefsColors = new LLPrefsColors(); |
171 | mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer); | 171 | mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer); |
172 | mPrefsVoice->setDefaultBtn(default_btn); | 172 | mPrefsColors->setDefaultBtn(default_btn); |
173 | 173 | ||
174 | mPrefsIM = new LLPrefsIM(); | 174 | mPrefsIM = new LLPrefsIM(); |
175 | mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); | 175 | mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); |
176 | mPrefsIM->getPanel()->setDefaultBtn(default_btn); | 176 | mPrefsIM->getPanel()->setDefaultBtn(default_btn); |
177 | |||
178 | mPrefsVoice = new LLPrefsVoice(); | ||
179 | mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer); | ||
180 | mPrefsVoice->setDefaultBtn(default_btn); | ||
181 | |||
177 | 182 | ||
178 | #if LL_LCD_COMPILE | 183 | #if LL_LCD_COMPILE |
179 | 184 | ||
@@ -192,10 +197,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def | |||
192 | mMsgPanel = new LLPanelMsgs(); | 197 | mMsgPanel = new LLPanelMsgs(); |
193 | mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer); | 198 | mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer); |
194 | mMsgPanel->setDefaultBtn(default_btn); | 199 | mMsgPanel->setDefaultBtn(default_btn); |
195 | |||
196 | mPrefsColors = new LLPrefsColors(); | ||
197 | mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer); | ||
198 | mPrefsColors->setDefaultBtn(default_btn); | ||
199 | 200 | ||
200 | mSkinsPanel = new LLPanelSkins(); | 201 | mSkinsPanel = new LLPanelSkins(); |
201 | mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer); | 202 | mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer); |