4 files changed, 25 insertions, 11 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 3e0a5fa..d7a2013 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -79,6 +79,10 @@
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
              name="radio select face" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
+             name="radio align" radio_style="true" width="114"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
         <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Edit linked parts" left="4" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 5564079..7343ac2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -153,7 +153,7 @@
              />
   <font_size name="Small"
              comment="Size of small font (points, or 1/72 of an inch)"
-             size="8"
+             size="8.5"
              />
 </fonts>
 
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 47eea07..9c265d2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -902,32 +902,32 @@ Would you like to disable all popups which can be skipped?
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="CacheWillClear"
- type="alertmodal">
+ type="notify">
 Cache will be cleared after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="CacheWillBeMoved"
- type="alertmodal">
+ type="notify">
 Cache will be moved after you restart [VIEWER_NAME].
 
 Note: This will clear the cache.
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="ChangeConnectionPort"
- type="alertmodal">
+ type="notify">
 Port settings take effect after you restart [VIEWER_NAME].
 </notification>
 
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
  name="ChangeSkin"
- type="alertmodal">
+ type="notify">
 The new skin will appear after you restart [VIEWER_NAME].
 </notification>
 
@@ -7122,8 +7122,8 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 
 <notification
  name="ChangeFont"
- icon="alertmodal.tga"
- type="alertmodal">
+ icon="notify.tga"
+ type="notify">
 The new font will appear after you restart [VIEWER_NAME].
 </notification>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
index 5865bec..c64ce9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -46,4 +46,14 @@
     Preview: The quick brown fox jumped over the lazy dog. :)
   </text>
 
+
+  <spinner name="font_mult" label="Font size multiplier:" label_width="130"
+           bottom="-280" left="20" height="16" width="180" follows="left|top"
+           decimal_digits="2" increment="0.01" max_val="3.0" min_val="0.1"
+           tool_tip="Multiply all font sizes by this amount." />
+
+  <check_box name="font_round" follows="left|top"
+             bottom="-300" left="20" height="16" width="300"
+             label="Force integer font sizes (may fix blurry fonts)" />
+
 </panel>