Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

5 files changed, 37 insertions, 14 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
index 2e91a82..9dda4ec 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
@@ -4,7 +4,7 @@
      min_height="271" min_width="290" mouse_opaque="true" name="script ed float"
      rect_control="FloaterOpenObjectRect" title="Script: New Script" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
         <button bottom="-545" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Reset" label_selected="Reset" left="362"
+             halign="center" height="22" label="Reset" label_selected="Reset" left="360"
              mouse_opaque="true" name="Reset" width="128" />
         <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
              height="18" initial_value="true" label="Running" left="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 0175508..4e13090 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -9,7 +9,7 @@
                 Loading...
         </text_editor>
         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Save" label_selected="Save" left="360"
+             halign="center" height="22" label="Save" label_selected="Save" left="360"
              mouse_opaque="true" name="Save_btn" width="128" />
         <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
              draw_heading="false" draw_stripes="true" enabled="true"
@@ -36,11 +36,17 @@
                         <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
                              mouse_opaque="true" name="Revert All Changes" width="138" />
       <menu_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator"
-     width="138" />
+           width="138" />
+      <menu_item_call bottom_delta="-76" height="20" label="Set External Editor..." left="0"
+           mouse_opaque="true" name="Set External Editor..." width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Open in External Editor" left="0"
+           mouse_opaque="true" name="Open in External Editor" width="138" />
+      <menu_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator2"
+           width="138" />
       <menu_item_call bottom_delta="-76" height="20" label="Export Script..." left="0"
-     mouse_opaque="true" name="Export Script..." width="138" />
+           mouse_opaque="true" name="Export Script..." width="138" />
       <menu_item_call bottom_delta="-96" height="20" label="Import Script..." left="0"
-     mouse_opaque="true" name="Import Script..." width="138" />
+           mouse_opaque="true" name="Import Script..." width="138" />
                 </menu>
                 <menu bottom="665" drop_shadow="true" enabled="true" height="198"
                      left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
index c97c4f7..b691282 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_voice_license.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="false" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="500" min_height="100" min_width="100"
+<floater can_close="false" can_drag_on_left="true" can_minimize="false"
+     can_resize="true" height="500" min_height="300" min_width="400"
      name="modal container" title="" width="600">
   <button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-             label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
-             name="Continue" width="100" />
+             label="Continue" label_selected="Continue" right="-16" mouse_opaque="true"
+             name="Continue" follows="right|bottom" width="100" />
   <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
-             width="100" />
-  <check_box bottom="-435" follows="top|right"
+             follows="left|bottom" width="100" />
+  <check_box bottom="-435" follows="bottom|left"
              font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Acceptable Use Policy"
              left="16" mouse_opaque="true" name="agree_chk" width="55" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -25,7 +25,7 @@ To use Vivox voice chat, you must agree to the terms of the policy.
     LICENSE_TEXT
   </text_editor>
   <!-- Loading text says: "Loading Vivox Acceptable Use Policy..." URL encoded -->
-  <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
+  <web_browser bottom="-406" embedded_items="false" follows="left|top|right|bottom" font="SansSerif"
              height="340" left="16" max_length="65536" mouse_opaque="true"
              name="license_html"
              start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
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 d60f985..bfb6866 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
@@ -175,7 +175,7 @@
                bottom_delta="-20" left_delta="0" height="20" width="250"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1"
-               max_length="31" mouse_opaque="true"
+               max_length="63" mouse_opaque="true"
                handle_edit_keys_directly="true"
                select_all_on_focus_received="true"
                allow_translate="false" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 04e71d4..9b55822 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -33,7 +33,24 @@ USE left="270" FOR TABBING OPTIONS
              tool_tip="Click to open Color Picker" width="65" />
   
   
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
+        mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394">
+    Client Tag Color:
+  </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
+       can_apply_immediately="true" color="0.79 0.44 0.88 1"
+       enabled="true" follows="left|top"
+       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
+       name="client_tag_color" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Color client tags" left_delta="76" mouse_opaque="true"
+       name="client_name_color_check" radio_style="false" width="160" />
+  
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
        height="1" left="55" name="border" width="380" />