Merge remote-tracking branch 'imprudence/1.4-beta1.5' into next

Conflicts (merged manually):
	.gitignore
	linden/indra/newview/llgesturemgr.cpp
	linden/indra/newview/viewerinfo.cpp

7 files changed, 60 insertions, 16 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
new file mode 100644
index 0000000..7974d85
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-200" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="200" width="200"
+     name="Clear Cache" title="Clear Disk Cache">
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-39" drop_shadow_visible="true" follows="left|top" font-style="BOLD|SHADOW"
+     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+     mouse_opaque="true" name="cache_label" v_pad="0" width="185">
+Cache Will Be Cleared After
+You Restart Imprudence
+  </text>
+  <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear texture cache" left="10"
+     mouse_opaque="true" name="texture_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear object cache" left_delta="0"
+     mouse_opaque="true" name="object_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear inventory cache" left_delta="0"
+     mouse_opaque="true" name="inv_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear sound cache" left_delta="0"
+     mouse_opaque="true" name="sounds_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear avatar name cache" left_delta="0"
+     mouse_opaque="true" name="name_cache" width="185" />
+  <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
+     label="OK" left="-170" mouse_opaque="true" name="btn_ok" width="80" />
+  <button bottom_delta="0" follows="right|top" font="SansSerif" halign="center" height="22"
+     label="Cancel" left="-85" mouse_opaque="true" name="btn_cancel" width="80" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
new file mode 100644
index 0000000..4a70c1c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-95" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="95" width="200"
+     name="Roll Dice" title="Roll Dice" rect_control="DiceFloaterRect">
+  <spinner bottom="-37" decimal_digits="0" follows="left|top" height="16"
+       increment="1" initial_val="1" label="Number of dice:" label_width="120" left="10"
+       max_val="512" min_val="1" mouse_opaque="true" name="spin_dice_count"
+       width="170" control_name="DiceLastCount" />
+  <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="16"
+       increment="1" initial_val="6" label="Number of sides:" label_width="120" left="10"
+       max_val="512" min_val="4" mouse_opaque="true" name="spin_dice_sides"
+       width="170" control_name="DiceLastSides" />
+  <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
+       label="Roll" left="-85" mouse_opaque="true" name="btn_roll" width="80" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 24a895b..3309c11 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -40,7 +40,7 @@
     </combo_item>
   </combo_box>
         <spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
-             follows="left|top" height="16" increment="0.01"
+             follows="left|top" height="16" increment="0.01" tool_top="Disable basic shaders to set gamma" 
              initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
              min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
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 03967d9..193592b 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
@@ -1609,10 +1609,15 @@
         <on_check control="ShowSearchBar" />
       </menu_item_check>
 
-        <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
+            <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
         <on_click function="Advanced.ReloadBalance" userdata="" />
       </menu_item_call>
 
+      <menu_item_check name="Roll Dice"
+                       label="Roll Dice">
+        <on_click function="Advanced.ToggleDice" userdata="" />
+        <on_check function="Advanced.CheckDice" userdata="" />
+      </menu_item_check>
 
       <menu_item_separator />
 
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 ea48462..5f97d74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -903,13 +903,6 @@ Would you like to disable all popups which can be skipped?
 
 <notification
  icon="notify.tga"
- name="CacheWillClear"
- type="notify">
-Cache will be cleared after you restart [VIEWER_NAME].
-</notification>
-
-<notification
- icon="notify.tga"
  name="CacheWillBeMoved"
  type="notify">
 Cache will be moved after you restart [VIEWER_NAME].
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 5713933..9f3c5c4 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
@@ -25,7 +25,7 @@ USE left="270" FOR TABBING OPTIONS
     Double-Click Action:
   </text>
 
-  <combo_box name="double_click_action"
+  <combo_box name="double_click_action" enabled="true" 
              bottom_delta="-25" left_delta="30" height="18" width="160"
              follows="left|top" mouse_opaque="true">
     <combo_item name="None" value="None">
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 27825b7..c3e8d83 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
         <button label="?" name="GraphicsPreferencesHelpButton"/>
-        <text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
+        <text_editor name="FullScreenInfo" width="460">
                 Décochez cette option pour passer en mode plein écran.
         </text_editor>
         <text name="WindowSizeLabel">
@@ -63,7 +63,7 @@
                 Options d&apos;affichage :
         </text>
         <check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
-        <check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
+        <check_box label="Auto-détection du ratio" name="aspect_auto_detect"/>
         <check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
         <check_box label="Montrer l&apos;avatar en vue subjective" name="avfp"/>
         <spinner label="Distance d&apos;affichage :" name="draw_distance"/>
@@ -73,7 +73,7 @@
         <text name="QualityText">
                 Performance :
         </text>
-        <text left="105" name="FasterText">
+        <text name="FasterText">
                 Plus rapide
         </text>
         <text name="ShadersPrefText">
@@ -88,11 +88,11 @@
         <text name="ShadersPrefText4">
                 Ultra
         </text>
-        <text bottom="-86" left="325" name="HigherText2">
+        <text name="HigherText2">
                 Plus élevée
         </text>
         <text name="QualityText2" visible="false"/>
-        <check_box label="Personnaliser" left="395" name="CustomSettings"/>
+        <check_box label="Personnaliser" name="CustomSettings"/>
         <text name="ShadersText">
                 Effets :
         </text>
@@ -173,7 +173,7 @@
                         Lumières à proximité
                 </radio_item>
         </radio_group>
-        <text left="380" name="TerrainDetailText">
+        <text name="TerrainDetailText">
                 Rendu du terrain :
         </text>
         <radio_group name="TerrainDetailRadio">