diff options
Diffstat (limited to 'linden/indra/newview/llpanelskins.cpp')
-rw-r--r-- | linden/indra/newview/llpanelskins.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp index 831adc8..deb7bc9 100644 --- a/linden/indra/newview/llpanelskins.cpp +++ b/linden/indra/newview/llpanelskins.cpp | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #include "llpanelskins.h" | 35 | #include "llpanelskins.h" |
36 | 36 | ||
37 | // linden library includes | 37 | // viewer library includes |
38 | #include "llradiogroup.h" | 38 | #include "llradiogroup.h" |
39 | #include "llbutton.h" | 39 | #include "llbutton.h" |
40 | #include "lluictrlfactory.h" | 40 | #include "lluictrlfactory.h" |
@@ -58,10 +58,10 @@ BOOL LLPanelSkins::postBuild() | |||
58 | skin_select->setCommitCallback(onSelectSkin); | 58 | skin_select->setCommitCallback(onSelectSkin); |
59 | skin_select->setCallbackUserData(this); | 59 | skin_select->setCallbackUserData(this); |
60 | 60 | ||
61 | getChild<LLButton>("meta7_preview")->setClickedCallback(onClickMeta7, this); | ||
62 | getChild<LLButton>("m7white_preview")->setClickedCallback(onClickM7White, this); | ||
63 | getChild<LLButton>("pslpurple_preview")->setClickedCallback(onClickPSLPurple, this); | ||
61 | getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this); | 64 | getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this); |
62 | getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this); | ||
63 | getChild<LLButton>("dark_preview")->setClickedCallback(onClickDark, this); | ||
64 | getChild<LLButton>("gemini_preview")->setClickedCallback(onClickGemini, this); | ||
65 | 65 | ||
66 | refresh(); | 66 | refresh(); |
67 | return TRUE; | 67 | return TRUE; |
@@ -104,25 +104,25 @@ void LLPanelSkins::onClickClassic(void* data) | |||
104 | } | 104 | } |
105 | 105 | ||
106 | //static | 106 | //static |
107 | void LLPanelSkins::onClickSilver(void* data) | 107 | void LLPanelSkins::onClickMeta7(void* data) |
108 | { | 108 | { |
109 | LLPanelSkins* self = (LLPanelSkins*)data; | 109 | LLPanelSkins* self = (LLPanelSkins*)data; |
110 | gSavedSettings.setString("SkinCurrent", "silver"); | 110 | gSavedSettings.setString("SkinCurrent", "meta7"); |
111 | self->getChild<LLRadioGroup>("skin_selection")->setValue("silver"); | 111 | self->getChild<LLRadioGroup>("skin_selection")->setValue("meta7"); |
112 | } | 112 | } |
113 | 113 | ||
114 | //static | 114 | //static |
115 | void LLPanelSkins::onClickDark(void* data) | 115 | void LLPanelSkins::onClickM7White(void* data) |
116 | { | 116 | { |
117 | LLPanelSkins* self = (LLPanelSkins*)data; | 117 | LLPanelSkins* self = (LLPanelSkins*)data; |
118 | gSavedSettings.setString("SkinCurrent", "dark"); | 118 | gSavedSettings.setString("SkinCurrent", "white_meta7"); |
119 | self->getChild<LLRadioGroup>("skin_selection")->setValue("dark"); | 119 | self->getChild<LLRadioGroup>("skin_selection")->setValue("white_meta7"); |
120 | } | 120 | } |
121 | 121 | ||
122 | //static | 122 | //static |
123 | void LLPanelSkins::onClickGemini(void* data) | 123 | void LLPanelSkins::onClickPSLPurple(void* data) |
124 | { | 124 | { |
125 | LLPanelSkins* self = (LLPanelSkins*)data; | 125 | LLPanelSkins* self = (LLPanelSkins*)data; |
126 | gSavedSettings.setString("SkinCurrent", "gemini"); | 126 | gSavedSettings.setString("SkinCurrent", "pslpurple"); |
127 | self->getChild<LLRadioGroup>("skin_selection")->setValue("gemini"); | 127 | self->getChild<LLRadioGroup>("skin_selection")->setValue("pslpurple"); |
128 | } | 128 | } |