Merge commit 'b3c39a47e76f595fd953d9ccffc58b0dfb8359db' into armin-1.2.0-next

6 files changed, 362 insertions, 49 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..4c2146b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
@@ -0,0 +1,263 @@
+<?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>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 059e8fb..d2ebbe6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -9,121 +9,150 @@
                 <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
                      left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
         </tab_container>
-        <icon bottom="-158" color="1, 1, 0.25, 1" follows="top|right" height="16"
+
+  <icon bottom="-56" color="0.5, 0, 0, 1" follows="top|right" height="16"
+   image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+   name="grid_icon" width="16" />
+  <combo_box allow_text_entry="false" bottom_delta="0" follows="top|right" height="20"
+     label="Grids" left_delta="20" max_chars="60" mouse_opaque="true"
+     name="grid_combo" tool_tip="Grid Selection" width="202">
+    <combo_item name="none_selected" value="None">
+      Grids
+    </combo_item>
+  </combo_box>
+  <!--
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-81" drop_shadow_visible="true" follows="top|right"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+             mouse_opaque="true" name="appearance_label" v_pad="0" width="145">
+    Keep Appearance
+  </text>
+  <check_box bottom="-81" control_name="KeepAppearance" follows="top|right"
+             font="SansSerifSmall" height="16" initial_value="false" label=""
+             left_delta="96" mouse_opaque="true" name="appearance_chk" width="55" />
+  -->
+  <button bottom="-78" follows="top|right" font="SansSerifSmall" halign="center"
+             height="16" label="Grid Manager" label_selected="Grid Manager" left_delta="117"
+             mouse_opaque="true" name="Grid Manager" tool_tip="Edit your grid list"
+             width="88" />
+  
+        <icon bottom="-187" color="1, 1, 0.25, 1" follows="top|right" height="16"
              image_name="legend.tga" left="1013" mouse_opaque="true" name="square"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-156" drop_shadow_visible="true" follows="top|right"
+             bottom="-188" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
                 Land For Sale
         </text>
-        <icon bottom="-158" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
+        <icon bottom="-187" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
              image_name="legend.tga" left="1123" mouse_opaque="true" name="square2"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-156" drop_shadow_visible="true" follows="top|right"
+             bottom="-188" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="auction_label" v_pad="0" width="145">
                 Auction
         </text>
-        <icon bottom="-56" color="1, 1, 1, 1" follows="top|right" height="16"
+  
+        <icon bottom="-101" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-56" drop_shadow_visible="true" follows="top|right"
+             bottom="-101" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="you_label" v_pad="0" width="145">
                 You
         </text>
-        <icon bottom="-56" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-101" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_home.tga" left="1073" mouse_opaque="true" name="home"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-56" drop_shadow_visible="true" follows="top|right"
+             bottom="-101" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="home_label" v_pad="0" width="145">
                 Home
         </text>
-        <button bottom="-56" follows="top|right" font="SansSerifSmall" halign="center"
+        <button bottom="-101" follows="top|right" font="SansSerifSmall" halign="center"
              height="16" label="Go Home" label_selected="Go Home" left_delta="57"
              mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
              width="88" />
-        <icon bottom="-82" color="0, 1, 0, 1" follows="top|right" height="8"
+        <icon bottom="-122" color="0, 1, 0, 1" follows="top|right" height="8"
                 image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
                 width="8" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom="-86" drop_shadow_visible="true" follows="top|right"
+                bottom="-126" drop_shadow_visible="true" follows="top|right"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="16"
                 mouse_opaque="true" name="person_label" v_pad="0" width="145">
                 Person
         </text>
-        <check_box bottom="-86" control_name="MapShowPeople" follows="top|right"
+        <check_box bottom="-126" control_name="MapShowPeople" follows="top|right"
                 font="SansSerifSmall" height="16" initial_value="false" label=" "
                 left_delta="70" mouse_opaque="true" name="people_chk" width="55" />
-        <icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-146" color="1, 1, 1, 1" follows="top|right" height="16"
                 image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
                 width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom="-106" drop_shadow_visible="true" follows="top|right"
+                bottom="-146" drop_shadow_visible="true" follows="top|right"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
                 mouse_opaque="true" name="infohub_label" v_pad="0" width="145">
                 Infohub
         </text>
-        <check_box bottom="-106" control_name="MapShowInfohubs" follows="top|right"
+        <check_box bottom="-146" control_name="MapShowInfohubs" follows="top|right"
                 font="SansSerifSmall" height="16" initial_value="false" label=""
                 left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
-        <icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-166" color="1, 1, 1, 1" follows="top|right" height="16"
                 image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
                 width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom="-126" drop_shadow_visible="true" follows="top|right"
+                bottom="-166" drop_shadow_visible="true" follows="top|right"
                 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
                 mouse_opaque="true" name="telehub_label" v_pad="0" width="145">
                 Telehub
         </text>
-        <check_box bottom="-126" control_name="MapShowTelehubs" follows="top|right"
+        <check_box bottom="-166" control_name="MapShowTelehubs" follows="top|right"
                 font="SansSerifSmall" height="16" initial_value="false" label=""
                 left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
-        <icon bottom="-86" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="icon_for_sale.tga" left="1123" mouse_opaque="true"
              name="landforsale" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-86" drop_shadow_visible="true" follows="top|right"
+             bottom="-126" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="land_for_sale_label2" v_pad="0" width="145">
                 Land For Sale
         </text>
-        <check_box bottom="-86" control_name="MapShowLandForSale" follows="top|right"
+        <check_box bottom="-126" control_name="MapShowLandForSale" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="false" label=""
              left_delta="80" mouse_opaque="true" name="land_for_sale_chk" width="55" />
-        <icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-146" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_event.tga" left="1123" mouse_opaque="true" name="event"
              width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-106" drop_shadow_visible="true" follows="top|right"
+             bottom="-146" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="events_label" v_pad="0" width="145">
                 Events
         </text>
-        <check_box bottom="-106" control_name="MapShowEvents" follows="top|right"
+        <check_box bottom="-146" control_name="MapShowEvents" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="false" label=""
              left_delta="80" mouse_opaque="true" name="event_chk" width="55" />
-        <icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-166" color="1, 1, 1, 1" follows="top|right" height="16"
              image_name="map_event_mature.tga" left="1123" mouse_opaque="true"
              name="events_mature_icon" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-126" drop_shadow_visible="true" follows="top|right"
+             bottom="-166" drop_shadow_visible="true" follows="top|right"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
              mouse_opaque="true" name="events_mature_label" v_pad="0" width="145">
                 Events (M)
         </text>
-        <check_box bottom="-126" control_name="ShowMatureEvents" follows="top|right"
+        <check_box bottom="-166" control_name="ShowMatureEvents" follows="top|right"
              font="SansSerifSmall" height="16" initial_value="true" label=""
              left_delta="80" mouse_opaque="true" name="event_mature_chk" width="55" />
-        <icon bottom="-181" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="avatar_icon" width="16" />
+
+  <icon bottom="-216" color="0.5, 0, 0, 1" follows="top|right" height="16"
+     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+     name="avatar_icon" width="16" />
         <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
              label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
              name="friend combo" tool_tip="Friend to Show on Map" width="202">
@@ -131,6 +160,7 @@
                         Online Friends
                 </combo_item>
         </combo_box>
+  
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="landmark_icon" width="16" />
@@ -141,6 +171,7 @@
                         Landmarks
                 </combo_item>
         </combo_box>
+  
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="location_icon" width="16" />
@@ -156,9 +187,10 @@
              mouse_opaque="true" name="search_label" v_pad="0" width="222">
                 Search Results:
         </text>
-        <scroll_list background_visible="true" bottom_delta="-306" draw_border="true"
+  
+        <scroll_list background_visible="true" bottom_delta="-266" draw_border="true"
              draw_stripes="false" 
-             follows="top|right|bottom" height="300" left="1013" multi_select="false"
+             follows="top|right|bottom" height="261" left="1013" multi_select="false"
              name="search_results" width="222">
                 <column label="" name="icon" width="16" />
                 <column label="" name="sim_name" width="206" />
@@ -178,7 +210,7 @@
              mouse_opaque="true" name="spin y"
              tool_tip="Y coordinate of location to show on map" width="66" />
         <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="0" left_delta="68" max_val="4096" min_val="0"
+             increment="1" initial_val="0" left_delta="68" max_val="16384" min_val="0"
              mouse_opaque="true" name="spin z"
              tool_tip="Z coordinate of location to show on map" width="66" />
         <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
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 81c49e7..a251f95 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..ed89977 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
@@ -71,6 +71,10 @@
         <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" />
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+                     height="24" label="Grid Manager" label_selected="Connect"
+                     left_delta="195" mouse_opaque="true" name="grid_btn" scale_image="TRUE"
+                     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"
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 48da432..c5237cc 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,10 +8,10 @@
              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="50" left_delta="0" max_val="1500" min_val="50"
-             mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
+             increment="100" initial_val="1500" left_delta="0" max_val="5000" min_val="100"
+             mouse_opaque="true" name="max_bandwidth" show_text="true" value="1500"
              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"
@@ -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"