From ca9a3c05c8db8a40ba5db5d666ee39118c5df2ca Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Thu, 29 Apr 2010 07:00:16 -0300
Subject: [PATCH] fixed up the login panel some more, all of the version
 spinners are there

---
 indra/newview/llpanellogin.cpp                | 15 +++++++-
 indra/newview/llpanellogin.h                  |  3 +-
 .../skins/default/xui/en-us/panel_login.xml   | 38 ++++++++++++-------
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 537951d9c..c2534ac7f 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -78,7 +78,9 @@
 #include "llglheaders.h"
 
 // <edit>
-#include "llappviewer.h"
+#include "llappviewer.h"
+#include "llspinctrl.h"
+#include <boost/lexical_cast.hpp>
 // </edit>
 #define USE_VIEWER_AUTH 0
 
@@ -385,7 +387,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	getChild<LLLineEditor>("id0_edit")->setEnabled(specify_id0);
 
 	fillMAC();
-	fillID0();
+	fillID0();
+	fillVer();
 
 	childSetCommitCallback("mac_check", onCheckMAC, this);
 	childSetCommitCallback("id0_check", onCheckID0, this);
@@ -420,6 +423,14 @@ void LLPanelLogin::fillID0()
 	{
 		getChild<LLLineEditor>("id0_edit")->setText(LLAppViewer::instance()->getSerialNumber());
 	}
+}
+
+void LLPanelLogin::fillVer()
+{
+	getChild<LLSpinCtrl>("vermaj_spin")->setValue((S32)gSavedSettings.getU32("SpecifiedVersionMaj"));
+	getChild<LLSpinCtrl>("vermin_spin")->setValue((S32)gSavedSettings.getU32("SpecifiedVersionMin"));
+	getChild<LLSpinCtrl>("verpatch_spin")->setValue((S32)gSavedSettings.getU32("SpecifiedVersionPatch"));
+	getChild<LLSpinCtrl>("verbuild_spin")->setValue((S32)gSavedSettings.getU32("SpecifiedVersionBuild"));
 }
 
 // static
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 2e2d0564f..28aaa1e53 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -119,7 +119,8 @@ private:
 	static void clearPassword();
 	// <edit>
 	void fillMAC();
-	void fillID0();
+	void fillID0();
+	void fillVer();
 	static void onCheckMAC(LLUICtrl* ctrl, void* userData);
 	static void onCheckID0(LLUICtrl* ctrl, void* userData);
 	// </edit>
diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml
index 702ee3722..215071c65 100644
--- a/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -99,42 +99,54 @@
 	     font="SansSerifSmall" h_pad="0" halign="right" height="16"
 	     left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
 	     hover="true" hover_color="50 115 185">
-		[CHANNEL] [VERSION]
+		[CHANNEL] [VERSION]
 	</text>-->
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
 	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="750" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="small">
+	     left="750" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="Small">
 		Channel:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
 	     follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
 	     height="20" left_delta="64" max_length="64" mouse_opaque="true"
-	     name="channel_edit" select_all_on_focus_received="true" width="230" font_size="small" />
+	     name="channel_edit" select_all_on_focus_received="true" width="230" font_size="Small" />
 	<check_box bottom="31" follows="left|bottom" font="SansSerifSmall" height="16"
 	     initial_value="false" label="MAC:" control_name="SpecifyMAC"
-	     left="750" mouse_opaque="true" name="mac_check" width="138" font_size="small" />
+	     left="750" mouse_opaque="true" name="mac_check" width="138" font_size="Small" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
 	     follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
 	     height="20" left_delta="64" max_length="32" mouse_opaque="true"
-	     name="mac_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="small" />
+	     name="mac_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="Small" />
 	<check_box bottom="8" follows="left|bottom" font="SansSerifSmall" height="16"
 	     initial_value="false" label="ID0:" control_name="SpecifyID0"
-	     left="750" mouse_opaque="true" name="id0_check" width="138" font_size="small" />
+	     left="750" mouse_opaque="true" name="id0_check" width="138" font_size="Small" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-	     follows="left|bottom" font="SansSerif" font_size="8pt" handle_edit_keys_directly="true"
+	     follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
 	     height="20" left_delta="64" max_length="32" mouse_opaque="true"
-	     name="id0_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="small" />
+	     name="id0_edit" select_all_on_focus_received="true" width="230" enabled="false" font_size="Small" />
 	     
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
 	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="1100" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="small">
+	     left="1050" mouse_opaque="true" name="channel_text" v_pad="0" width="120" font_size="Small">
 		Version:
 	</text>   
-	<spinner decimal_digits="0" follows="left|bottom" height="16"
-			     increment="1" initial_val="0" label="Maj" label_width="10" left_delta="20"
-			     max_val="512" min_val="0" mouse_opaque="true" name="Ver Maj"
-			     text_enabled_color="110, 15, 15, 255" width="87" font_size="small" />
+	<spinner decimal_digits="0" follows="left|bottom" height="15"
+			     increment="1" initial_val="0" label="Major" label_width="40" left_delta="64" bottom_delta="7"
+			     max_val="512" min_val="0" mouse_opaque="true" name="vermaj_edit" control_edit="SpecifiedVersionMaj"
+			     text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" />
+	<spinner decimal_digits="0" follows="left|bottom" height="15"
+			     increment="1" initial_val="0" label="Minor" label_width="40" left_delta="0"
+			     max_val="512" min_val="0" mouse_opaque="true" name="vermin_edit" control_edit="SpecifiedVersionMin"
+			     text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" />
+	<spinner decimal_digits="0" follows="left|bottom" height="15"
+			     increment="1" initial_val="0" label="Build" label_width="40" left_delta="0"
+			     max_val="512" min_val="0" mouse_opaque="true" name="verpatch_edit" control_edit="SpecifiedVersionPatch"
+			     text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" />
+	<spinner decimal_digits="0" follows="left|bottom" height="15"
+			     increment="1" initial_val="0" label="Patch" label_width="40" left_delta="0"
+			     max_val="512" min_val="0" mouse_opaque="true" name="verbuild_edit" control_edit="SpecifiedVersionBuild"
+			     text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" />
 
 </panel>