Change the skin preferences panel to have the meta skins.

5 files changed, 37 insertions, 37 deletions

diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index f35998f..fd1e365 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -58,10 +58,10 @@ BOOL LLPanelSkins::postBuild()
         skin_select->setCommitCallback(onSelectSkin);
         skin_select->setCallbackUserData(this);
 
+        getChild<LLButton>("meta7_preview")->setClickedCallback(onClickMeta7, this);
+        getChild<LLButton>("m7white_preview")->setClickedCallback(onClickM7White, this);
+        getChild<LLButton>("pslpurple_preview")->setClickedCallback(onClickPSLPurple, this);
         getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this);
-        getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this);
-        getChild<LLButton>("dark_preview")->setClickedCallback(onClickDark, this);
-        getChild<LLButton>("gemini_preview")->setClickedCallback(onClickGemini, this);
 
         refresh();
         return TRUE;
@@ -104,25 +104,25 @@ void LLPanelSkins::onClickClassic(void* data)
 }
 
 //static 
-void LLPanelSkins::onClickSilver(void* data)
+void LLPanelSkins::onClickMeta7(void* data)
 {
         LLPanelSkins* self = (LLPanelSkins*)data;
-        gSavedSettings.setString("SkinCurrent", "silver");
-        self->getChild<LLRadioGroup>("skin_selection")->setValue("silver");
+        gSavedSettings.setString("SkinCurrent", "Meta7");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("Meta7");
 }
 
 //static 
-void LLPanelSkins::onClickDark(void* data)
+void LLPanelSkins::onClickM7White(void* data)
 {
         LLPanelSkins* self = (LLPanelSkins*)data;
-        gSavedSettings.setString("SkinCurrent", "dark");
-        self->getChild<LLRadioGroup>("skin_selection")->setValue("dark");
+        gSavedSettings.setString("SkinCurrent", "white_Meta7");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("white_Meta7");
 }
 
 //static 
-void LLPanelSkins::onClickGemini(void* data)
+void LLPanelSkins::onClickPSLPurple(void* data)
 {
         LLPanelSkins* self = (LLPanelSkins*)data;
-        gSavedSettings.setString("SkinCurrent", "gemini");
-        self->getChild<LLRadioGroup>("skin_selection")->setValue("gemini");
+        gSavedSettings.setString("SkinCurrent", "pslpurple");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("pslpurple");
 }
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
index 8dbd556..615b619 100644
--- a/linden/indra/newview/llpanelskins.h
+++ b/linden/indra/newview/llpanelskins.h
@@ -50,9 +50,9 @@ public:
 private:
         static void onSelectSkin(LLUICtrl* ctrl, void* data);
         static void onClickClassic(void* data);
-        static void onClickSilver(void* data);
-        static void onClickDark(void* data);
-        static void onClickGemini(void* data);
+        static void onClickMeta7(void* data);
+        static void onClickM7White(void* data);
+        static void onClickPSLPurple(void* data);
 
 private:
         std::string mSkin;
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png
new file mode 100644
index 0000000..ab35bc0
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/skin_thumbnail_Meta7.png
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png
new file mode 100644
index 0000000..e93ea4c
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/skin_thumbnail_white_Meta7.png
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 58a2989..b8dfbba 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -10,36 +10,36 @@
   </text>
   <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
              name="skin_selection" width="480">
-    <radio_item bottom="-20" height="20" left="0" name="default" width="480">
-      Default
+    <radio_item bottom="-20" height="20" left="0" name="Meta7" width="480">
+      Meta 7
     </radio_item>
-    <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480">
-      Silver
+    <radio_item bottom_delta="-50" height="20" left="0" name="white_Meta7" width="480">
+      Meta 7 white
     </radio_item>
-    <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
-      Dark
+    <radio_item bottom_delta="-50" height="20" left="0" name="pslpurple" width="480">
+      PSL purple
     </radio_item>
-    <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
-      Gemini
+    <radio_item bottom_delta="-50" height="20" left="0" name="default" width="480">
+      Classic
     </radio_item>
   </radio_group>
   
-  <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 
+  <button left="130" bottom="-125" width="216" height="95" name="meta7_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_Meta7.png" 
+          image_unselected="skin_thumbnail_Meta7.png" image_hover_selected="skin_thumbnail_Meta7.png"
+          image_hover_unselected="skin_thumbnail_Meta7.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="m7white_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_white_Meta7.png" 
+          image_hover_selected="skin_thumbnail_white_Meta7.png" image_unselected="skin_thumbnail_white_Meta7.png" 
+          image_hover_unselected="skin_thumbnail_white_Meta7.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="pslpurple_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png"
+          image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png"
+          image_hover_unselected="skin_thumbnail_pslpurple.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="classic_preview" 
           scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
-          image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png"
+          image_hover_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" 
           image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview" 
-          scale_image="true" label="" image_selected="skin_thumbnail_silver.png" 
-          image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" 
-          image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
-          scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
-          image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
-          image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview" 
-          scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
-          image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
-          image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
   <text name="skin_current_text"
               left="10" bottom="5" halign="left" height="12"
         follows="left|bottom" h_pad="0" v_pad="0"