8 files changed, 65 insertions, 23 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index d31357f..569e421 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -726,7 +726,7 @@ Only large parcels can be listed in search.
                         </combo_box>
                         <button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
                              halign="center" height="18" label="?" label_selected="?" left="400"
-                             mouse_opaque="true" name="?" width="18" />
+                             mouse_opaque="true" name="?" width="20" />
                         <check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Mature Content" left="14"
                              mouse_opaque="true" name="MatureCheck" radio_style="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index 68443c5..e2bafbf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -62,5 +62,5 @@
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
              label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
         <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-             left="570" name="EnvSettingsHelpButton" width="18" />
+             left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index be8508f..c8ec0fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,20 +37,25 @@
         <string name="unavailable_text_label">
                 Text chat is not available for this call.
         </string>
-        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
-             name="profile_callee_btn" width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif"
-             halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
-             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <string name="history_entry">
+    History
+  </string>
+  <string name="pay_entry">
+    Pay
+  </string>
+  <string name="teleport_entry">
+    Offer Teleport
+  </string>
+  <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
+       list_position="below" mouse_opaque="true" name="profile_callee_btn">
+  </flyout_button>
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="107" name="start_call_btn" width="100" />
+             label="Call" left_delta="95" name="start_call_btn" width="100" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
              visible="false" width="100" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
-          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 2e97d64..fd63221 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -45,10 +45,10 @@
                 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                      height="130" left="0" min_width="210" name="im_contents_panel" width="175">
                         <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-                             name="group_info_btn" tab_group="0" width="80" />
+                             name="group_info_btn" tab_group="0" width="90" />
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-                             label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+                             label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
                              width="92" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index bc1a6fc..ccc348d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6384,6 +6384,24 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
   </notification>
 
   <notification
+               icon="notify.tga"
+               name="QueryClientTags"
+               type="notify">
+          Would you like to have the client tag database automatically updated from imprudenceviewer.org?
+          This ensures that you have the latest information available regarding other clients.
+          <form name="form">
+                  <button
+                         index="0"
+                         name="Yes"
+                         text="Yes"/>
+                  <button
+                         index="1"
+                         name="No"
+                         text="No"/>
+          </form>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="UnableToOpenCommandURL"
    priority="high"
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 6415402..e334f78 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
@@ -99,7 +99,7 @@
                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" 
+             follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
                    initial_value="false" mouse_opaque="true"  />
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e9ab27c..547b547 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -32,7 +32,7 @@
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="47" label="You" left="148"
+             enabled="true" follows="left|top" height="56" label="You" left="148"
              mouse_opaque="true" name="user" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
@@ -55,7 +55,7 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="47"  label="Objects" left="148" mouse_opaque="true"
+             height="56" label="Objects" left="148" mouse_opaque="true"
              name="objects" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
@@ -77,7 +77,7 @@
              enabled="true" follows="left|top" height="56"
              label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-28" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box3" v_pad="0" width="135">
                 Chat Console:
@@ -116,7 +116,7 @@
              mouse_opaque="true" name="chat_full_width_check" radio_style="false"
              width="239" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-              bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+              bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
@@ -134,20 +134,18 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
-  <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
+        <check_box bottom_delta="-18" control_name="ScriptErrorsAsChat" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show script errors and warnings as regular chat" left="148"
              mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
              width="275" />
-        <check_box bottom_delta="-20" enabled="true"
         <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+        <check_box bottom_delta="-18" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" 
-       label="Show custom chat channel" left="148" mouse_opaque="true"
+             label="Show custom chat channel" left="148" mouse_opaque="true"
              name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 79f775b..fa4f3a5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -47,7 +47,7 @@
              increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
              mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
              mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
                 Camera Follow Distance:
@@ -57,6 +57,27 @@
              increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
              mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
              width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+       mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+    Camera Transition Time:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true" decimal_digits="1"
+       enabled="true" follows="left|top" height="16" increment="0.1"
+       initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
+       name="zoom_time" show_text="false" value="2" width="128" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+    Camera Smoothing:
+  </text>
+  <slider bottom_delta="-6" can_edit_text="true"
+             decimal_digits="1" enabled="true" follows="left|top" height="16"
+             increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+             mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
+             width="128" />
         <check_box bottom_delta="-24" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"