Merge branch 'gridmanager' into next

5 files changed, 435 insertions, 83 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 42d9782..acac138 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -2237,6 +2237,23 @@ Offer friendship to [NAME]?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="AddFriendWithMessage" title="Add Friend">
+                <message name="message">
+Friends can give permissions to track each
+other on the map and receive online status updates.
+
+Offer friendship to [NAME]?
+                </message>
+                <editline name="editline">
+                        Would you be my friend?
+                </editline>
+                <option name="Offer">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="RemoveFromFriends">
                 <message name="message">
                         Do you want to remove [FIRST_NAME] [LAST_NAME] from your Friends List?
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
new file mode 100644
index 0000000..8116213
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="false"
+     can_resize="true" height="400" min_height="400" min_width="600"
+     name="floater_login" title="plasticwuzhere" width="600">
+
+  <!-- Grid Selector -->
+  <text type="string" length="1" enabled="true" name="grid_selector_label"
+                height="10" width="100" left="5" top="-20"
+                h_pad="0" v_pad="0" halign="left"
+                font="SansSerif"
+                follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+            drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Select a grid:
+  </text>
+  
+  <scroll_list background_visible="true" bottom_delta="25" draw_border="true"
+             draw_stripes="false" 
+             follows="top|left|bottom" height="340" left="5" multi_select="false"
+             name="grid_selector" width="170">
+    <column label="" name="grid" width="200" />
+  </scroll_list>
+  
+  <!-- Grid Selector Buttons -->
+  <button label="Add" label_selected="Delete" enabled="true" name="btn_add"
+                height="18" width="55" left="5" bottom_delta="-20"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Copy" label_selected="Add" enabled="true" name="btn_copy"
+                height="18" width="55" left_delta="58" bottom_delta="0"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Delete" label_selected="Copy" enabled="true" name="btn_delete"
+                height="18" width="55" left_delta="58" bottom_delta="0"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+
+  <!-- Grid Details -->
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     top="-25" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="60" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+    Grid Name:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="360"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="40" mouse_opaque="true"
+             name="gridnick" select_all_on_focus_received="true" width="200" />
+
+
+  <!--
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
+                First Name:
+        </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+   name="first_name" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
+    Last Name:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+   name="last_name" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
+                Password:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="16" mouse_opaque="true"
+             name="avatar_password" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="start_location_text" v_pad="0"
+             width="95">
+    Start Location:
+  </text>
+  <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="18"
+             left_delta="90" max_chars="128" mouse_opaque="true"
+             name="start_location_combo" width="180">
+    <combo_item name="MyHome" value="My Home">
+      My Home
+    </combo_item>
+    <combo_item name="MyLastLocation" value="My Last Location">
+      My Last Location
+    </combo_item>
+    <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+      &lt;Type region name&gt;
+    </combo_item>
+  </combo_box>
+  -->
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
+    Login URI:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="loginuri" select_all_on_focus_received="true" width="320" />
+
+  <button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
+                height="18" width="100" bottom_delta="-22"
+                halign="center"
+                follows="left|top" scale_image="true"
+          font="SansSerifSmall" mouse_opaque="true" />
+
+  <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-62"
+     embedded_items="false" enabled="false" follows="left|top"
+     font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
+     left="190" max_length="65535" mouse_opaque="true"
+     name="protip1" tab_stop="false" width="420" word_wrap="true">
+    Tip: Store information for alternate accounts by using the "Copy" button to create multiple profiles for the same grid.
+  </text_editor>
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="10" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="182" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Optional Fields
+  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="0" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Login Page:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="loginpage" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="-90" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
+    Helper URI:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="helperuri" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="website_text" v_pad="0" width="120">
+    Website:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="website" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="support_text" v_pad="0" width="120">
+    Support URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="support" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="register_text" v_pad="0" width="120">
+    Account URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="register" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+    Password URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="password" select_all_on_focus_received="true" width="320" />
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-4" follows="top|left" height="155" left_delta="-93" name="OptionalPrefsBorder" width="417" />
+
+  <!-- Combo box for multi avatar grid manager avatar name
+        <combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
+                bottom_delta="0" follows="left|top" font="SansSerif" handle_edit_keys_directly="true"
+                height="20" left="290" max_length="45" mouse_opaque="true"
+                name="name_combo" select_all_on_focus_received="true" width="185" />
+  -->
+  <!-- Buttons for mutli avatar grid manager
+  <button bottom="159" follows="top|right" font="SansSerif" halign="center"
+             height="20" label="New" label_selected="New"
+             left="480" mouse_opaque="true" name="new_btn" scale_image="TRUE"
+             width="70" />
+  -->
+  <!--
+  <button bottom="134" follows="top|right" font="SansSerif" halign="center"
+             height="20" label="Remove" label_selected="Remove"
+             left="480" mouse_opaque="true" name="remove_btn" scale_image="TRUE"
+             width="70" />
+-->
+
+  <!-- Checkbox for selecting a global avatar (for when combo box avatar selector works)
+  <check_box bottom="85" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Global Avatar"
+             left_delta="0" mouse_opaque="true" name="global_check" width="138" />
+
+  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+             initial_value="false" label="Remember password"
+             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
+  
+  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+     initial_value="false" label="secret level"
+     left_delta="165" mouse_opaque="true" name="gawd_mode" width="138" />
+  -->
+
+  <!-- Cancel/Connect Buttons -->
+
+  <button bottom="-44" follows="right|top" font="SansSerif" halign="center"
+             height="24" label="Set as Default" label_selected="Set as Default"
+             left="470" mouse_opaque="true" name="set_default" scale_image="TRUE"
+             width="110" />
+  <!-- <button bottom="28" follows="right|bottom" font="SansSerif" halign="center"
+             height="24" label="Connect" label_selected="Connect"
+             left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+             width="100" />  -->
+  <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+     height="24" label="Ok" label_selected="Apply" left="280"
+     mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
+  <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+     height="24" label="Apply" label_selected="Apply" left="385"
+     mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
+        <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+             height="24" label="Undo" label_selected="Undo" left="490"
+             mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
+  <!--
+        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+             left_delta="135" max_chars="40" mouse_opaque="true"
+             name="server_combo" width="200" />
+  -->
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 512ee16..81fe178 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -72,6 +72,10 @@
                 userdata="" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Logout" label="Logout"
+                    shortcut="control|alt|Q">
+          <on_click function="File.Logout" userdata="" />
+    </menu_item_call>
     <menu_item_call name="Quit" label="Quit"
                     shortcut="control|Q">
       <on_click function="File.Quit" userdata="" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 2122ee7..5b2f3ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -1,56 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
-             name="login_html" right="-1"
-             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-             top="-1" />
+
+<panel name="panel_login" 
+       bottom="0" left="0" height="600" width="800"
+       follows="left|top|right|bottom" mouse_opaque="true" >
+
+        <web_browser name="login_html" 
+               bottom="0" top="-1" left="0" right="-1"
+               border_visible="false" follows="top|left|bottom|right"
+                     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" />
         <string name="real_url">
                 http://secondlife.com/app/login/
         </string>
         <string name="forgot_password_url">
                 http://secondlife.com/account/request.php
         </string>
-        <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="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
-                First Name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="32" max_length="31" mouse_opaque="true"
-             name="first_name_edit" select_all_on_focus_received="true" width="120" />
-        <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="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
-                Last Name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="164" max_length="31" mouse_opaque="true"
-             name="last_name_edit" select_all_on_focus_received="true" width="120" />
-        <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="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
-                Password:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="296" max_length="16" mouse_opaque="true"
-             name="password_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="10" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
-             width="95">
+
+
+  <!-- START LOCATION -->
+
+        <text name="start_location_text" 
+              bottom="8" left="24" height="16" width="95"
+        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerifSmall" mouse_opaque="true">
                 Start Location:
         </text>
-        <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
-             left_delta="97" max_chars="128" mouse_opaque="true"
-             name="start_location_combo" width="155">
+        <combo_box name="start_location_combo"
+             bottom_delta="2" left_delta="100" height="16" width="150"
+             follows="left|bottom" font="SansSerifSmall"
+             mouse_opaque="true" allow_text_entry="true" max_chars="128">
                 <combo_item name="MyHome" value="My Home">
                         My Home
                 </combo_item>
@@ -61,35 +40,129 @@
                         &lt;Type region name&gt;
                 </combo_item>
         </combo_box>
-        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
-             initial_value="false" label="Remember password"
-             left_delta="163" mouse_opaque="true" name="remember_check" width="138" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             height="24" label="Log In" label_selected="Log In"
-             left="435" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
-             width="120" />
-        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
-             left_delta="135" max_chars="20" mouse_opaque="true"
-             name="server_combo" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="45" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="create_new_account_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+
+  <!-- FIRST NAME -->
+
+        <text name="first_name_text" 
+              bottom="56" left="24" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                First Name:
+        </text>
+        <line_editor name="first_name_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+
+
+  <!-- LAST NAME -->
+
+        <text name="last_name_text" 
+              bottom_delta="20" left_delta="130" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Last Name:
+        </text>
+        <line_editor name="last_name_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+
+
+  <!-- PASSWORD -->
+
+        <text name="password_text" 
+              bottom_delta="20" left_delta="130" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Password:
+        </text>
+        <line_editor name="password_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+        <check_box name="remember_check" label="Remember password"
+             bottom_delta="-24" left_delta="0" height="16" width="140"
+             follows="left|bottom" font="SansSerifSmall" 
+                   initial_value="false" mouse_opaque="true"  />
+
+
+  <!-- GRIDS -->
+
+        <text name="grid_text" 
+              bottom="56" left_delta="150" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Grid:
+        </text>
+        <combo_box name="server_combo"
+             bottom_delta="-20" left_delta="0" height="20" width="120"
+             follows="left|bottom" allow_text_entry="false"
+             max_chars="20" mouse_opaque="true" />
+        <button name="grid_btn" label="Grid Manager"
+          bottom_delta="-24" left_delta="10" height="16" width="100"
+          follows="left|bottom" font="SansSerifSmall" halign="center"
+                      mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- LOG IN -->
+
+        <button name="connect_btn" label="Log In"
+          bottom="34" left_delta="140" height="24" width="120"
+          follows="left|bottom" font="SansSerif" halign="center"
+                mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- ACCOUNT / FORGOT PASSWORD -->
+
+        <text name="create_new_account_text"
+              bottom="45" left="-210" height="16" width="200"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Sign up for account
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="25" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+        <text name="forgot_password_text"
+              bottom="25" left="-210" height="16" width="200"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Forgot your name or password?
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="5" drop_shadow_visible="true" follows="right|bottom"
-             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 -->
+
+        <text name="channel_text"
+              bottom="5" left="-310" height="16" width="300"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" mouse_opaque="true"
+        hover="true" hover_color="50 115 185">
                 [CHANNEL] [VERSION]
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index d4ec307..655859a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -8,7 +8,7 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="200">
                 Maximum Bandwidth:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true"
+        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
              mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
@@ -25,22 +25,15 @@
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
              v_pad="0" width="200">
-                Disk Cache Size:
+                Disk Cache Size (MB):
         </text>
-        <slider bottom_delta="-25" can_edit_text="true"
+        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
              mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="186" mouse_opaque="false" name="text_box5"
-             v_pad="0" width="40">
-                MB
-        </text>
         <button bottom="-55" bottom_delta="-4" enabled="true" follows="left|bottom"
              font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
-             left_delta="30" mouse_opaque="true" name="clear_cache" scale_image="true"
+             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
              width="100" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
@@ -51,7 +44,7 @@
         </text>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
              enabled="false" follows="left|top" font="SansSerif"
-             handle_edit_keys_directly="true" height="20" left_delta="7"
+             handle_edit_keys_directly="true" height="20" left_delta="0"
              max_length="4096" mouse_opaque="true" name="cache_location"
              select_all_on_focus_received="false" width="470" word_wrap="false" />
         <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
@@ -61,12 +54,12 @@
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Set" left_delta="103" mouse_opaque="true"
              name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-35"
+        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
              enabled="true" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Custom Port Connection" left="12"
              mouse_opaque="true" name="connection_port_enabled" radio_style="false"
              width="256" />
-        <spinner bottom="-193" bottom_delta="-20"
+        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port Number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"