Manual cleanup from merge up to viewer-development.

Some viewer-development code had been moved, and so wasn't patched with my
panel_login layout changes; verified each of my llpanellogin.cpp commits
against new tip rev. Reformatted panel_login.xml in the spirit of the
preferred indentation scheme but with my layout changes.

2 files changed, 119 insertions, 119 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index ca7e032dca..ba25f78e0d 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -619,10 +619,10 @@ void LLPanelLogin::updateLocationSelectorsVisibility()
 	if (sInstance) 
 	{
 		BOOL show_start = gSavedSettings.getBOOL("ShowStartLocation");
-	sInstance->getChild<LLLayoutPanel>("start_location_panel")->setVisible(show_start);
+		sInstance->getChild<LLLayoutPanel>("start_location_panel")->setVisible(show_start);
 
 		BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-	sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server);
+		sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server);
 	}	
 }
 
@@ -909,7 +909,7 @@ void LLPanelLogin::updateServer()
 			// update the login panel links 
 			bool system_grid = LLGridManager::getInstance()->isSystemGrid();
 	
-			sInstance->getChildView("create_new_account_text")->setVisible( system_grid);
+			sInstance->getChildView("create_new_account_btn")->setVisible( system_grid);
 			sInstance->getChildView("forgot_password_text")->setVisible( system_grid);
 
 			// grid changed so show new splash screen (possibly)
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6ba3279be6..9c96143aa3 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -7,7 +7,7 @@
     name="panel_login"
     focus_root="true" 
     top="600"
- width="1130">
+    width="1130">
   <string name="reg_in_client_url" translate="false">
     http://secondlife.eniac15.lindenlab.com/reg-in-client/
   </string>
@@ -28,43 +28,43 @@
       start_url=""
       top="0"
       height="600"
-    width="996"/>
+      width="996"/>
   <layout_stack
-animate="false"
+      animate="false"
       follows="left|bottom|right"
       name="login_widgets"
       layout="topleft"
       orientation="horizontal"
       top="519"
-width="1130"
+      width="1130"
       height="80">
     <layout_panel
         auto_resize="false"
         follows="left|bottom"
         name="login"
         layout="topleft"
-width="310"
-min_width="310"
+        width="310"
+        min_width="310"
         height="80">
       <text
           follows="left|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
-height="16"
-name="log_in_text"
-top="8"
-left="15"
-width="150">
-LOG IN
-</text>
-<text
-follows="left|bottom"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
+          height="16"
+          name="log_in_text"
+          top="8"
+          left="15"
+          width="150">
+        LOG IN
+      </text>
+      <text
+          follows="left|bottom"
           font="SansSerifSmall"
           height="16"
           name="username_text"
-top="35"
-left="15"
+          top="35"
+          left="15"
           width="150">
         Username:
       </text>
@@ -89,10 +89,10 @@ left="15"
       <text
           follows="left|bottom"
           font="SansSerifSmall"
-height="16"
+          height="16"
           name="password_text"
-top="35"
-left="175"
+          top="35"
+          left="175"
           width="150">
         Password:
       </text>
@@ -105,22 +105,22 @@ left="175"
           select_on_focus="true"
           top_pad="0"
           width="135" />
-</layout_panel>
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="start_location_panel"
-layout="topleft"
-width="175"
-min_width="175"
-height="80">
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-left="10"
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="start_location_panel"
+        layout="topleft"
+        width="175"
+        min_width="175"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          left="10"
           name="start_location_text"
-top="35"
+          top="35"
           width="130">
         Start at:
       </text>
@@ -128,7 +128,7 @@ top="35"
           allow_text_entry="true"
           control_name="NextLoginLocation"
           follows="left|bottom"
-  height="22"
+          height="22"
           max_chars="128"
           top_pad="0"
           name="start_location_combo"
@@ -145,112 +145,112 @@ top="35"
             label="&lt;Type region name&gt;"
             name="Typeregionname"   value="" />
       </combo_box>
-</layout_panel>
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="grid_panel"
-layout="topleft"
-width="145"
-height="80"
-visible="false">
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="grid_panel"
+        layout="topleft"
+        width="145"
+        height="80"
+        visible="false">
       <combo_box
           allow_text_entry="false"
           font="SansSerifSmall"
           follows="left|right|bottom"
           height="23"
           max_chars="256"
-left="10"
-top="51"
+          left="10"
+          top="51"
           layout="topleft"
           top_pad="2"
           name="server_combo"
-width="135" />
+          width="135" />
     </layout_panel>
     <layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="links_login_panel"
-layout="topleft"
-width="290"
+        auto_resize="false"
+        follows="left|bottom"
+        name="links_login_panel"
+        layout="topleft"
+        width="290"
         height="80">
       <text
-follows="left|bottom"
+          follows="left|bottom"
           font="SansSerifSmall"
           text_color="EmphasisColor"
-left="10"
+          left="10"
           height="16"
-name="login_help"
-top="19"
-width="280">
-       Need help logging in?
+          name="login_help"
+          top="19"
+          width="280">
+        Need help logging in?
       </text>
       <text
-follows="left|bottom"
+          follows="left|bottom"
           font="SansSerifSmall"
           text_color="EmphasisColor"
           height="16"
           name="forgot_password_text"
-top="35"
-width="280">
+          top="35"
+          width="280">
         Forgot your username or password?
       </text>
-<button
-  follows="left|bottom"
-  top_pad="0"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  name="connect_btn"
-  width="90" />
-<check_box
-control_name="RememberPassword"
-follows="left|bottom"
-font="SansSerifSmall"
-left="110"
-top="56"
-height="16"
-label="Remember password"
-  top_pad="3"
-  name="remember_check"
- width="145" />
-</layout_panel>
-<layout_panel
-tab_stop="false"
-follows="right|bottom"
-name="links" 
-width="210"
-min_width="210"
-height="80">
+      <button
+          follows="left|bottom"
+          top_pad="0"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Log In"
+          label_color="White"
+          layout="topleft"
+          name="connect_btn"
+          width="90" />
+      <check_box
+          control_name="RememberPassword"
+          follows="left|bottom"
+          font="SansSerifSmall"
+          left="110"
+          top="56"
+          height="16"
+          label="Remember password"
+          top_pad="3"
+          name="remember_check"
+          width="145" />
+    </layout_panel>
+    <layout_panel
+        tab_stop="false"
+        follows="right|bottom"
+        name="links" 
+        width="210"
+        min_width="210"
+        height="80">
       <text
           follows="right|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
           halign="right"
           height="16"
-name="create_account_text"
-top="8"
-right="-15"
+          name="create_account_text"
+          top="8"
+          right="-15"
           width="200">
-CREATE YOUR ACCOUNT
-</text>
-<button
-  follows="right|bottom"
-  top="35"
-  right="-15"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Start now"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="create_new_account_btn"
-  width="90" />
+        CREATE YOUR ACCOUNT
+      </text>
+      <button
+          follows="right|bottom"
+          top="35"
+          right="-15"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Start now"
+          label_color="White"
+          layout="topleft"
+          left_pad="10"
+          name="create_new_account_btn"
+          width="90" />
     </layout_panel>
   </layout_stack>
 </panel>