aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llconsole.cpp2
-rw-r--r--linden/indra/newview/llgroupnotify.cpp2
-rw-r--r--linden/indra/newview/lltexturectrl.cpp2
-rw-r--r--linden/indra/newview/llviewerwindow.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/fonts.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml4
12 files changed, 26 insertions, 22 deletions
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 2379da3..2cea383 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -117,7 +117,7 @@ void LLConsole::setFontSize(S32 size_index)
117 } 117 }
118 else if (1 == size_index) 118 else if (1 == size_index)
119 { 119 {
120 mFont = LLFontGL::getFontSansSerifBig(); 120 mFont = LLFontGL::getFontSansSerifLarge();
121 } 121 }
122 else 122 else
123 { 123 {
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 8e98cbc..81e6c21 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -186,7 +186,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
186 LLFontGL::getFontSansSerif(), 186 LLFontGL::getFontSansSerif(),
187 FALSE); 187 FALSE);
188 188
189 static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig")); 189 static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifLarge"));
190 static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif")); 190 static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif"));
191 191
192 text->appendStyledText(subject + "\n",false,false,headerstyle); 192 text->appendStyledText(subject + "\n",false,false,headerstyle);
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 38849f9..ccc3ab2 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1514,7 +1514,7 @@ void LLTextureCtrl::draw()
1514 (mTexturep->getDiscardLevel() != 1) && 1514 (mTexturep->getDiscardLevel() != 1) &&
1515 (mTexturep->getDiscardLevel() != 0)) 1515 (mTexturep->getDiscardLevel() != 0))
1516 { 1516 {
1517 LLFontGL* font = LLFontGL::getFontSansSerifBig(); 1517 LLFontGL* font = LLFontGL::getFontSansSerifLarge();
1518 font->renderUTF8( 1518 font->renderUTF8(
1519 mLoadingPlaceholderString, 0, 1519 mLoadingPlaceholderString, 0,
1520 llfloor(interior.mLeft+10), 1520 llfloor(interior.mLeft+10),
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 57580cf..6ef9982 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2178,7 +2178,7 @@ void LLViewerWindow::draw()
2178 { 2178 {
2179 // Used for special titles such as "Second Life - Special E3 2003 Beta" 2179 // Used for special titles such as "Second Life - Special E3 2003 Beta"
2180 const S32 DIST_FROM_TOP = 20; 2180 const S32 DIST_FROM_TOP = 20;
2181 LLFontGL::getFontSansSerifBig()->renderUTF8( 2181 LLFontGL::getFontSansSerifLarge()->renderUTF8(
2182 mOverlayTitle, 0, 2182 mOverlayTitle, 0,
2183 llround( getWindowWidth() * 0.5f), 2183 llround( getWindowWidth() * 0.5f),
2184 getWindowHeight() - DIST_FROM_TOP, 2184 getWindowHeight() - DIST_FROM_TOP,
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 3370ea8..47638d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -117,7 +117,7 @@ sold with objects
117 <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1" 117 <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
118 width="64" /> 118 width="64" />
119 <text bottom_delta="38" follows="top|left" height="16" left="72" 119 <text bottom_delta="38" follows="top|left" height="16" left="72"
120 name="account_action" right="438" width="218" font="SansSerifBig" > 120 name="account_action" right="438" width="218" font="SansSerifLarge" >
121 Upgrade you to premium membership. 121 Upgrade you to premium membership.
122 </text> 122 </text>
123 <text follows="top|left" height="16" left="72" name="account_reason" right="400" 123 <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -139,7 +139,7 @@ sold with objects
139 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 139 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
140 name="step_2" width="64" /> 140 name="step_2" width="64" />
141 <text bottom_delta="38" follows="top|left" height="16" left="72" 141 <text bottom_delta="38" follows="top|left" height="16" left="72"
142 name="land_use_action" right="438" width="218" font="SansSerifBig" > 142 name="land_use_action" right="438" width="218" font="SansSerifLarge" >
143 Increase your monthly land use fees to US$ 40/month. 143 Increase your monthly land use fees to US$ 40/month.
144 </text> 144 </text>
145 <text follows="top|left" height="32" left="72" name="land_use_reason" right="435" 145 <text follows="top|left" height="32" left="72" name="land_use_reason" right="435"
@@ -151,7 +151,7 @@ This parcel is 512 sq.m. of land.
151 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 151 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
152 name="step_3" width="64" /> 152 name="step_3" width="64" />
153 <text bottom_delta="38" follows="top|left" height="16" left="72" 153 <text bottom_delta="38" follows="top|left" height="16" left="72"
154 name="purchase_action" right="438" font="SansSerifBig" > 154 name="purchase_action" right="438" font="SansSerifLarge" >
155 Pay Joe Resident L$ 4000 for the land 155 Pay Joe Resident L$ 4000 for the land
156 </text> 156 </text>
157 <text follows="top|left" height="16" left="72" name="currency_reason" right="400"> 157 <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index d91b5ff..3aeba26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -27,7 +27,7 @@
27 <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c" 27 <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
28 left="0" name="step_price" width="64" /> 28 left="0" name="step_price" width="64" />
29 <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label" 29 <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
30 right="-20" font="SansSerifBig" > 30 right="-20" font="SansSerifLarge" >
31 Set a price: 31 Set a price:
32 </text> 32 </text>
33 <text follows="top|left" height="16" left="72" name="price_text" right="-20"> 33 <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -44,7 +44,7 @@
44 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 44 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
45 name="step_sell_to" width="64" /> 45 name="step_sell_to" width="64" />
46 <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label" 46 <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
47 right="-20" font="SansSerifBig" > 47 right="-20" font="SansSerifLarge" >
48 Sell the land to: 48 Sell the land to:
49 </text> 49 </text>
50 <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20"> 50 <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -69,7 +69,7 @@
69 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 69 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
70 name="step_sell_objects" width="64" /> 70 name="step_sell_objects" width="64" />
71 <text bottom_delta="38" follows="top|left" height="16" left="72" 71 <text bottom_delta="38" follows="top|left" height="16" left="72"
72 name="sell_objects_label" right="-20" font="SansSerifBig" > 72 name="sell_objects_label" right="-20" font="SansSerifLarge" >
73 Sell the objects with the land? 73 Sell the objects with the land?
74 </text> 74 </text>
75 <text bottom_delta="-20" follows="top|left" height="16" left="72" 75 <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
89 <button bottom_delta="4" height="16" label="Show Objects" name="show_objects" 89 <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
90 right="414" width="110" /> 90 right="414" width="110" />
91 <text bottom_delta="-35" follows="top|left" height="16" left="72" 91 <text bottom_delta="-35" follows="top|left" height="16" left="72"
92 name="nag_message_label" right="-20" font="SansSerifBig" > 92 name="nag_message_label" right="-20" font="SansSerifLarge" >
93 REMEMBER: All sales are final. 93 REMEMBER: All sales are final.
94 </text> 94 </text>
95 <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale" 95 <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
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 7343ac2..e9ede83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -147,6 +147,10 @@
147 comment="Size of large font (points, or 1/72 of an inch)" 147 comment="Size of large font (points, or 1/72 of an inch)"
148 size="12" 148 size="12"
149 /> 149 />
150 <font_size name="Bigger"
151 comment="Size of medium font (points, or 1/72 of an inch)"
152 size="11"
153 />
150 <font_size name="Medium" 154 <font_size name="Medium"
151 comment="Size of medium font (points, or 1/72 of an inch)" 155 comment="Size of medium font (points, or 1/72 of an inch)"
152 size="10" 156 size="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 3e69d15..b032b09 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -21,7 +21,7 @@ Hover your mouse over the options for more help.
21 prevalidate="ascii" v_pad="0" width="300" spell_check="true" /> 21 prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
22 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 22 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
23 bottom="-20" drop_shadow_visible="true" follows="left|top" 23 bottom="-20" drop_shadow_visible="true" follows="left|top"
24 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 24 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
25 mouse_opaque="true" name="group_name" v_pad="0" width="300"> 25 mouse_opaque="true" name="group_name" v_pad="0" width="300">
26 Type your new group name here 26 Type your new group name here
27 </text> 27 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index 9341d4b..b5f7b37 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -18,7 +18,7 @@
18 </string> 18 </string>
19 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 19 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
20 bottom="-20" drop_shadow_visible="true" follows="left|top" 20 bottom="-20" drop_shadow_visible="true" follows="left|top"
21 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 21 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
22 mouse_opaque="true" name="group_land_heading" v_pad="0" width="150"> 22 mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
23 Group Owned Land 23 Group Owned Land
24 </text> 24 </text>
@@ -105,7 +105,7 @@
105 </text> 105 </text>
106 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 106 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
107 bottom_delta="-25" drop_shadow_visible="true" follows="left|top" 107 bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
108 font="SansSerifBig" h_pad="0" halign="left" height="16" left="12" 108 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="12"
109 mouse_opaque="true" name="group_money_heading" v_pad="0" width="150"> 109 mouse_opaque="true" name="group_money_heading" v_pad="0" width="150">
110 Group [CURRENCY] 110 Group [CURRENCY]
111 </text> 111 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index bca87d9..e6d7604 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -15,7 +15,7 @@ the General tab.
15 <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" 15 <button bottom="-24" font="SansSerif" halign="center" height="16" label="?"
16 label_selected="?" left="391" name="help_button" width="20" /> 16 label_selected="?" left="391" name="help_button" width="20" />
17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-20" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 18 bottom="-20" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
19 halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0" 19 halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0"
20 width="436"> 20 width="436">
21 Group Notices Archive 21 Group Notices Archive
@@ -51,7 +51,7 @@ Notice lists are limited to 200 notices per group on a daily basis.
51 <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice" 51 <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
52 left="1" mouse_opaque="true" name="panel_create_new_notice" width="418"> 52 left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
53 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 53 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
54 bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 54 bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
55 halign="left" height="16" left="7" mouse_opaque="false" name="lbl" 55 halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
56 v_pad="0" width="436"> 56 v_pad="0" width="436">
57 Create a Notice 57 Create a Notice
@@ -115,7 +115,7 @@ and you can&apos;t send a folder.
115 <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice" 115 <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
116 left="1" mouse_opaque="true" name="panel_view_past_notice" width="418"> 116 left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">
117 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 117 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
118 bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 118 bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
119 halign="left" height="16" left="7" mouse_opaque="false" name="lbl" 119 halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
120 v_pad="0" width="436"> 120 v_pad="0" width="436">
121 Archived Notice 121 Archived Notice
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index e5b621e..014b28d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -12,7 +12,7 @@
12 name="help_button" width="20" /> 12 name="help_button" width="20" />
13 <panel border="false" bottom="-24" height="24" left="7" name="members_header" 13 <panel border="false" bottom="-24" height="24" left="7" name="members_header"
14 visible="true" width="380"> 14 visible="true" width="380">
15 <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0" 15 <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
16 name="static" width="150"> 16 name="static" width="150">
17 Members &amp; Roles 17 Members &amp; Roles
18 </text> 18 </text>
@@ -24,7 +24,7 @@ easily be customized, allowing for greater organization and flexibility.
24 </panel> 24 </panel>
25 <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header" 25 <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
26 visible="false" width="380"> 26 visible="false" width="380">
27 <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0" 27 <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
28 name="static" width="100"> 28 name="static" width="100">
29 Roles 29 Roles
30 </text> 30 </text>
@@ -47,7 +47,7 @@ easily be customized, allowing for greater organization and flexibility.
47 </panel> 47 </panel>
48 <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header" 48 <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
49 visible="false" width="380"> 49 visible="false" width="380">
50 <text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0" 50 <text bottom_delta="0" font="SansSerifLarge" halign="left" height="16" left="0"
51 name="static" width="200"> 51 name="static" width="200">
52 Abilities 52 Abilities
53 </text> 53 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index 168b60b..64be465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -20,7 +20,7 @@ vote on open proposals, and view old proposals.
20 name="help_button" width="20" /> 20 name="help_button" width="20" />
21 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 21 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
22 bottom="446" drop_shadow_visible="true" follows="left|top" 22 bottom="446" drop_shadow_visible="true" follows="left|top"
23 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 23 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
24 mouse_opaque="false" name="proposal_header" v_pad="0" width="363"> 24 mouse_opaque="false" name="proposal_header" v_pad="0" width="363">
25 Open Group Proposals 25 Open Group Proposals
26 </text> 26 </text>
@@ -144,7 +144,7 @@ vote on open proposals, and view old proposals.
144 mouse_opaque="true" name="btn_abstain" width="63" /> 144 mouse_opaque="true" name="btn_abstain" width="63" />
145 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 145 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
146 bottom="-240" drop_shadow_visible="true" follows="left|top" 146 bottom="-240" drop_shadow_visible="true" follows="left|top"
147 font="SansSerifBig" h_pad="0" halign="left" height="10" left="12" 147 font="SansSerifLarge" h_pad="0" halign="left" height="10" left="12"
148 mouse_opaque="false" name="txt" v_pad="0" width="363"> 148 mouse_opaque="false" name="txt" v_pad="0" width="363">
149 Group Voting History 149 Group Voting History
150 </text> 150 </text>