From bf59cb9aa91a9af6c37ce9bd293a2d22dbfc11ba Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 1 Mar 2011 14:39:18 +0100
Subject: [PATCH] UI cleanup

---
 indra/newview/llviewermenu.cpp                 |   1 +
 .../skins/default/textures/icon_top_pick.tga   | Bin 858 -> 1068 bytes
 .../skins/default/xui/en-us/panel_login.xml    |   4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 63c13309f..8729d5714 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -867,6 +867,7 @@ void init_menus()
 	LLRect menuBarRect = gLoginMenuBarView->getRect();
 	
 	menu = new LLMenuGL(CLIENT_MENU_NAME);
+	menu->setCanTearOff(FALSE);
 	menu->append(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
 	gLoginMenuBarView->appendMenu(menu);
 	menu->updateParent(LLMenuGL::sMenuContainer);
diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga
index 7fe119a818038c7526e2eea458d5fc9524087c43..0b34882d2f6475e01a59fa0ded8713372fb9c22e 100644
GIT binary patch
literal 1068
zcmYk5drXs87{<S^bS><{urin~0(Dr)Ok0pqM?rxYD&4RSt+qPmM9f%6X9Pv3@&}S^
zSwL=8B-2g`E<la8Qz{e2#jVR~Tu?IRjLu<U11Vh-K<P^B*Jr1ME<4FDPoDRj=X{s<
z9ExI5!4W}4P;sFEs32q}jIfN5NZ3etm#}?N13pj>%yWX7ppx2)G$&L_N5!0Dtw<Q5
zBVY4UA#Bj$OWkzDEB9y)x1Frf5@ZBHVEzBHVXWn^YeNzw&TvH`gt|85{`?T{P5B_R
zJw$9(8=lX3-^W@KHA2yJJ;`of+=D}u&5BPdBH6j+)n;t6`=Oi!)J|a6-$1?#P)z|F
ze)oglU<Nxn#<93Z;60YH_`+2oYoyNb&&=5UMH4i~EAdI$QS2`*!~PNi(SR>5uSDU=
zCdf}TAa;#-g2&?>;c~fa*_kQ>J7+H<Z!oAhrH6+B3>PlK(At6KmUjF#;llZr4(Lg(
zvEvF%_F2fZ$C$WyLFW=4PaY!9{F8gE4dJ~EKCe9u5=U284=mTZakaA><0K#Oo!5GB
z$<mAdN7KmHbs!-*^-)w*w3_^HAMe5gtQcTWRine`D4_Ys4zX|=VH_{krOYpQlW7nG
z)|<FBHiMGOHYBBGcw%B=_XK+M#*KNT+89*VG~i$fL-64GbvGs^pO9xiMacmVKGt~f
z*!cv*q*nR;eXL8BB0hdqKIhd~Z@T#bb`JSbU8_TM<TKRij5v3`b%B`~HyY1;gO^{L
zgTB>>;VCyx-Ekmev(lHCv~~+GC2K5`^!Mm}KTg)4#=%kshY$JC*XM=H<wZYH^^QM~
zmp6iooxQM;Goh^c8iKU!@i_iUDPOUtMXW4D)0iLiXY{a>?^mgYuv*|i=yUT(lQPg~
z>@b?|!1Ti)%oBd>t2IC(Qy4QcGUG%alnVH7rawN?Y=*w=61;xk+wOi?y1v5|OAma+
zkGr1YH^&^Vj=E7fa1V*O>S=MZL@pGH7S8bc-Nj`I$#2cpoi*Se(!iUye}VPZZS?&#
z2<JRd)o#II;{dkS8S(aq2Rx#zoN~EbzSL^9(ZM^AQ&3#CNs;Gj{K^39&|Tbh%wTwy
zK_BVYmp}drZ9_9Q7HFq8s0%)=sHotP94nX&YT==BN%8R$CfPRiq-1@TPbf-6QhL@i
u@jEKVYGu*oRD~*K@4liJNN@hjk~^?4lv}rF?~rekZ&3)<GI?&ci24_-W<!qv

literal 858
zcmZuwPej9E7=HUljj2nA#O$y`yA|mYb=f5nkyuK{MA4zcj7;k<6Ol-VT}EP}-RjUt
z%&5Z-k&&3On8--P^7KCMul*+a_<g_k{l52k-{<}FiFl;3dZb7Eo!eA*^}`mWIJZsx
z&^EE(heGuRH_s`YKP0e8rG=-wb`7PSDvxWZ;HsF!%wa&U2h>F*J&kviFq!Zfh>oS3
zn=Z(tSb*%yxnT&&S2C#7pKz322ld4Dve`&T?TOLlI`A!v1zk#xneldJ(e(1yBW_D+
zJ0p<9|8)>p6@1{;iLPuIv4*m7rc6-yD2S1$BR3d$NkbQgBZ4oy8F1rb*61d4F{{_<
zT@++E8tZf%sQuppOda^~tppf~=*FL@;JW-N3eOmkVOzNALVP^#g@+ZEaY6Rw%yq*W
z(p~C)4<tluLW}_ETlLx6Vl8i$rOyJ`FQV8<{@Kau_cJ=ePVgq0f$Lf)ra((_SWSgo
z^jOSea$S8boD5m~CYq(8Um}NoOUOD?Cm%MFGWmq|dYkAjGG}|4s{{md$AikFhDJPQ
zlq+A_cv`|v#+-VaLjQ_p(l3anX8>*8z?$klr%A>@?QFE&4XwTNf>2DyUZ;V_&P&-*
K$({@NdgKRZ-E#>5

diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml
index 6943f291a..c18a07fcc 100644
--- a/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -42,7 +42,7 @@
 
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16"
+	     font="SansSerif" h_pad="0" halign="left" height="16"
 	     left="339" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
 		Grid:
 	</text>
@@ -56,7 +56,7 @@
 
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16"
+	     font="SansSerif" h_pad="0" halign="left" height="16"
 	     left="475" mouse_opaque="true" name="start_location_text" v_pad="0" width="120">
 		Start Location:
 	</text>