Release 1.5.5

indra/llcommon/llversionviewer.h

@@ -35,8 +35,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 5;
-const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_PATCH = 5;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Singularity";
 

indra/llui/llmenugl.cpp

@@ -101,8 +101,8 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8;
 const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10;
 const S32 MENU_ITEM_PADDING = 4;
 
-const std::string BOOLEAN_TRUE_PREFIX( "X" );
+const std::string BOOLEAN_TRUE_PREFIX( "\xe2\x9c\x93" ); // U+2714 -- MC
-const std::string BRANCH_SUFFIX( ">" );
+const std::string BRANCH_SUFFIX( "\xE2\x96\xB6" ); // U+25B6 BLACK RIGHT-POINTING TRIANGLE
 const std::string ARROW_UP  ("^^^^^^^");
 const std::string ARROW_DOWN("vvvvvvv");
 

indra/newview/app_settings/settings.xml

@@ -6110,7 +6110,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Ubuntu-R.ttf</string>
+      <string>DroidSans.ttf</string>
     </map>
     <key>FontSansSerifBundledFallback</key>
     <map>
@@ -6132,7 +6132,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Ubuntu-B.ttf</string>
+      <string>DroidSans-Bold.ttf</string>
     </map>
     <key>FontSansSerifFallback</key>
     <map>
@@ -6154,7 +6154,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.95</real>
+      <real>1.00</real>
     </map>
     <key>FontScreenDPI</key>
     <map>
@@ -6176,7 +6176,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>16.0</real>
+      <real>14.0</real>
     </map>
     <key>FontSizeLarge</key>
     <map>
@@ -6187,7 +6187,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>11.5</real>
+      <real>11.0</real>
     </map>
     <key>FontSizeMedium</key>
     <map>

indra/newview/skins/default/xui/en-us/fonts.xml

@@ -21,13 +21,13 @@
   </font>
 
   <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>"MtBkLfRg.ttf"</file>
+    <file>DroidSans.ttf</file>
   </font>
 
   <font name="SansSerifBold" 
 	comment="Name of bold sans-serif font" 
 	font_style="Bold">
-    <file>MtBdLfRg.ttf</file>
+	<file>DroidSans-Bold.ttf</file>
   </font>
 
   <font name="Monospace"
@@ -92,19 +92,19 @@
 	     />
   <font_size name="Huge"
 	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="16.0"
+	     size="14.0"
 	     />
   <font_size name="Large"
 	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="12.0"
+	     size="11.0"
 	     />
   <font_size name="Medium"
 	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="10.0"
+	     size="9.5"
 	     />
   <font_size name="Small"
 	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="9"
+	     size="8.5"
 	     />
 </fonts>
 

indra/newview/skins/default/xui/en-us/panel_status_bar.xml

@@ -15,21 +15,21 @@
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
 	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" left="-210" mouse_opaque="true"
+	     halign="right" height="18" left="-230" mouse_opaque="true"
 	     name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
-	     v_pad="2" width="76">
+	     v_pad="2" width="86">
 		Loading...
 	</text>
 	<button bottom="-18" enabled="true" follows="right|bottom" font="SansSerifSmall"
 	     halign="center" height="18" 
 	     image_selected="button_enabled_selected_32x128.tga"
 	     image_unselected="button_enabled_32x128.tga" label="[CURRENCY]"
-	     left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
+	     left="-220" mouse_opaque="true" name="buycurrency" scale_image="true"
-	     tool_tip="Buy currency" width="36" />
+	     tool_tip="Buy currency" width="24" />
 	<text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
 	     enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-	     halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
+	     halign="right" height="18" left="-310" mouse_opaque="true" name="TimeText"
 	     text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
 		12:00 AM
 	</text>