From 9f84a348ca08dd0487b2a7dff13da905fd8e11bd Mon Sep 17 00:00:00 2001 From: Erica Date: Wed, 25 Nov 2009 14:30:16 -0800 Subject: [PATCH] EXT-2779 World map - clean up layout and simplify --- .../default/textures/icon_event_adult.tga | Bin 648 -> 1006 bytes .../skins/default/textures/icon_top_pick.tga | Bin 858 -> 1068 bytes .../skins/default/textures/map_avatar_16.tga | Bin 1068 -> 1068 bytes .../skins/default/textures/map_avatar_8.tga | Bin 300 -> 300 bytes .../skins/default/textures/map_event.tga | Bin 1068 -> 1068 bytes .../default/textures/map_event_adult.tga | Bin 648 -> 1006 bytes .../default/textures/map_event_mature.tga | Bin 1068 -> 1068 bytes .../skins/default/textures/map_home.tga | Bin 1068 -> 1068 bytes .../skins/default/textures/map_infohub.tga | Bin 1068 -> 1068 bytes .../skins/default/textures/map_telehub.tga | Bin 1068 -> 1068 bytes .../skins/default/textures/textures.xml | 15 +- .../default/xui/en/floater_world_map.xml | 766 ++++++++++-------- .../xui/en/panel_region_general_layout.xml | 242 ------ 13 files changed, 452 insertions(+), 571 deletions(-) delete mode 100644 indra/newview/skins/default/xui/en/panel_region_general_layout.xml diff --git a/indra/newview/skins/default/textures/icon_event_adult.tga b/indra/newview/skins/default/textures/icon_event_adult.tga index c344fb1e78887afe2b20ac4830ffb057772416cd..f548126e5a98bb1c831872dd054ccb540a7eb170 100644 GIT binary patch literal 1006 zcmX|=Ye-XJ7{_PKEj{Yl+2*#Enb`~rWf{&3)hrx}X(D)8LsHYQq%u|(BXG`HrbT`T zq@XNHBD+Af%(O2Wso94RBFlpA^eL(jMS+*|?|Dwy3;(@)-}C&Q=l|YRsz}vB)2Vc- zgoGduBUWW@*pQICX3Au-&O}8;$%VE15E&UMOR?rzVVUiPN-(%6POC(V3mKBuIz}b;kf4?l+=|2I3$udV!g<7j!ELU!?LZIimQi+kH%!J>Z{Ep+HF?jYIP|RvH z8kvx$aQZ=Ybv0^hYvFA>NkO9+ehUN{(>!<$1g;KZOX)UbW@f_SaDWL?d$?AsmD#`B z?FR3%x3e49o__g<_CEQH>VwV7{$^xkz;3sL2|`baf@GNC$>QQ-6c!eu`Em&Nr)M!p zy7c&y()UmO#-TG;!Es!dPg}1y@Jic7?b4Mm;^X6ypP!F{qOIuY9|u=#?HfX6<6-z| z>v|_XEAu(7JSBnIY=+Tj{7MO$M3tb=;}c_Bo`(JC8GQq9*Eu*hZB{I=-{{2dU>DAe zOvByaMN(1{RoBaEwYr}YRPY_sMi^p4F)^ZC*W3yBu0~{MXa8R>TV`!3uSAuv4bjoj zvdLunK%9?cU%2H`lw=%Ux_pJq_IQo#C_OzLsi~<*OiX0UFk37#U5`%$@)OA;2@46r zXkaE=K5N{vZHT#c^DQ)DQeni34v65mBNO7&s5J7=kB|kc>NQsB<1b{;JG(`eWoFh_wh%Qi zWSm1;soJ&cO)Y)5H&OHj)-sG%vU!kzJ6zAL7l5QDl+Zn@JaVB{luRfU+1dHENiIy0 YF#2#F?j9#k&3$uwbMk!EOed%I2Uv>&3jhEB 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{<{urin~0(Dr)Ok0pqM?rxYD&4RSt+qPmM9f%6X9Pv3@&}S^ zSwL=8B-2g`E%yWX7ppx2)G$&L_N5!0Dtw5uSDU= zCdf}TAa;#-g2&?>;c~fa*_kQ>J7+HPlK(At6KmUjF#;llZr4(Lg( zvEvF%_F2fZ$C$WyLFW=4PaY!9{F8gE4dJ~EKCe9u5=U284=mTZakaA><0K#Oo!5GB z$>;VCyx-Ekmev(lHCv~~+GC2K5`^!Mm}KTg)4#=%kshY$JC*XM=H?^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?&# z2F*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*8z?$klr%A>@?QFE&4XwTNf>2DyUZ;V_&P&-* K$({@NdgKRZ-E#>5 diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga index ce129e3590178b7e7d9e16b483944c377951e0f3..f59e9e9193f90f5232d2b962eac8f2eff7821096 100644 GIT binary patch literal 1068 zcmZXTdq`7Z7{RWlV`LleuqbfwFTnRyxN64P8aON9dUABE8c0=o!e7Ajr- zh)M}&RJ4dFx?2R3B8Vs|XHr^OS_FYnj&q*gciV}e0}n4d=li|idwC{=S}0GHh!S)3 z0E8m?Vj#tmvPik4Qc^`Y@^606-*pP3M0yvg(&<;K%!#Me38_P>nemfCqlL;iB>Amx)%`20VtK^>RWph;aeZgkcny~~5*Cxh5L7C^pl5SBI%A_}(#)Y0Z4 zp;C1aTN2Kpqo`FUFWgD&MBHI73f{>m{|vasflXh5E#H93F<`Y{hPBfRZA{{qa1O2` zR&7n6t4UiqZfx-)&O>~zCeuDLb*~4;I}*&4qk3~1 zUbhO|atoZO5@;?JI9L|SHSej6_(u{<%^vVfi7%yj2TbP%kZ@l@@;c1So2sy-jh%~=}rdo+(#VcolS}% z&7gaXH-CdUzF#-nGHLS;U?a_L2lZC>QbzlQc3f-_xZV`vvs;hAbWcJwiTjM;``I7V zziDaCu$}h1hvwckB%_07biR%(*)8y?GsJTZW@015_4B;gW5j1!o!fgd%WH9RSjMGM z8P~>SoH@D)m^dBG!E906k>Gr|cNXu9eM)?6#k`}OuCreFz5~yH02l7wz`nW_ z!QNYrH=^+JVrBm+zZcxXPQE@ zi`XAzC)n%6{`EiSD6Fn`XD+vmmQ~f_!0BEb^ZC*0pM>j%A8CikA4N4_pR(7LdzJr> z5=(YArL1*r?^$45Gi-{tOsZ)|(_$?F<0AWrKBuyqy-uuFInPmf%F8P9HaONh);ZH% K`Htee4Dkm+NdX`L literal 1068 zcmaiy3rv+|7=S;NaWj*^5*!e43LfT2DNv2_FetgcpSWE6>P+Dwjo3!?U)Q;$3nCubp2ov#=bO)fpqoFXXh$ zFZ!1tk<)$ruXv?xC%C$e#dU+Ms2{@IG(>vaU6Puw6SV(Z+>khhb<`fe(3!b^1nxF)1u7k|M+F)E+jRz`U1J;J`f zforA}=cTJy{*INjPs-81o{2IpBh~gbMOVS+(;A%obT#5@&l%!8H}DUAZ6C(QJIs-} z*=sgYUT>#k4Elhkn-1c03sEn|l6kI+g(ur_OGqCTS9?>7M~nsI1qb?5-KaP6$vav* z?%9Xor$3?NFNtw`6vLZa@Xadb`PyIce*X~SYX2qQJ2{61_A%z}sYR_?&z^=hy8fPU zHD5zJNBZsxlqnfQO%G2WY0>--h1^+*89evnDE{SVQHh%=Idh(0?*HT49TR6*QLqbT z$tLuh%lKC|X}*>pX77mQM7KH!`mzJ3lpUCg%4i#b9=U(}J?NFaD=u{6@oEa5?^O`q zJdAJg=bFDs2y}aF=B?D@4J2J0A>d%$_#UrV%h+50GsikE^X`f7cxv6-xTY4M|EibJ zA8z5kG~OYuQP9eMFP(uB`!%fnFyGdQ%CL^daW-#e+FRRsyvRoIsUDVH93v!O?xEDN zadYD1CslXAl9wrK@2Bt@M4$T|V^u4`2hO6avJ)k_m~{#A&iCQzA9PjL8y@ntrj}2g zvqM73scGQj0mzYDDH?(gq`kZME*mPU@tObZZ?Y~@6CP0lWNe>ub-Q6O#S^hUo7k<} zh*-CQC*~P$%iL#z{t@2Pp&%JB3%NqRU=jY)do5{=$r5LdTb&TLHYP6KWK<6TRHn84 diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga index 28552f223798d1a1d4c0c04a50af38cee77b9e24..8500eadebaff5b248671f236ada77d8a60cb2a63 100644 GIT binary patch literal 300 zcmZQzU}As)4h9Ye1&;s!|1%K6Kpln*TEtEg3d;d4T z`SHK=@prHqkU1c`K=Qn5IuBzj>p|@Qn_vIN6- z|F1iJ=f6y5)qe(gHMspiZ44kaylUDHnK(HAF=-fFg}DtR2LmBNp{`+`!Jhtpx)E-k IKCXHU05716=>Px# literal 300 zcma)$%?-mK424ZkjFAOe^^^?~2?>bQrd1YU5Ef$!G6e_M55-Z{Q=jw+8$bULT}Wlg z(qN4-^arDOionNB93F-G>@caRI}DLH4ZwRTcU>cKo5!>zRw_%H|mN4>B}J*bBe nQ1AWNBk>Logk8wL_T$dq`|p?yRO{n4z1`C-@w&~7ANWykt9>s)vl>jN-avXKCG}Y+QgKvjR`doMkTIV zQYNe~mEp?Ac0M*kWHl?5*&4>3_kNy#dYk|D+q3umKfmAeKF{-eIZn(8$ANR;=E?wY z0_etupd|Pa!U(a1#L38>*?V>`6*xkqclIKwEJ)!ZlY)x=pzAd)-&6gfD* z5lO9UC?}5)K~S;$|F|~dS)O@LYX32LOa|1YdPF_#!^ROaA`E?SKcR=MF4Zh^bnfRw zqBF#ep45<1l!)go$+q$e_;GHx4uwrsNEil^M}d?vVAEG1X$08T){e9JQIO1V`!cD) zzC$VYP|vsW4jPpoZN$#nYp6S(f?LPp5cl>Qq6aNl|6v^Z(kyfoYH*~s44$Qp5G!VU zBrfa4PZE+;Dba0(Qx^~4?oqtYQ6Q(T0k891QB++D<4zCkyIPJ{JKT_L{DkGNEwGPF zHFMLXdg6y!`GyQy@6$ux&clT?9_>~`cgKiT?E|=YDi@)xeMoBRMn^#~7CyJY^&t;M zp&o3e#E+$Un-$gXFsGBpyaznap4@?gi>DFx-h#N#fVR(q;*xwEzHkiF+j!Wu^029V zH?bGuC$b$a>iUh91|CHf<)}E3i4{HHC%9~Wv818t?8p7R0f@M1fFsqBxBLdERJhb%pv19`gul=|=}?LgcR-8G`j(0Lu-+NizL-ymuUx!&m&#*V@KAn5BMjewm*c?WuYd4qn*s&R z?dUq7f#wMh&u;3Q<|iwp{d)zBGOrWghIx2(TJ9b%|G@E*nkEeW`lr!bmW9?+=_sqc zg7Bw2RJ0r0q6zK~=5^vu`JZX%w&d>d4GbQNPs_le%QdKJsK#KnJvQHd0q-N^kF{ID ze9F8o)D`|8Ax3BKQfZUZt9*hr1J1MEO$P&~!A|LJmM;w%l!Yc$GOrU?BIL6uoP_wq U@C}jcBiF^KlOrOd!WVOY0aZK^xc~qF literal 1068 zcmb7@&q@O^5XPtWpeHGK@z@v8n>XKeKSdRMNWicAOjhm-QV2`%!c-)=SE*XGmhLm2H#%xZp>p2_dD5nyp7kb zsxCC@^rf#b>LM1-gO+&If?vN(WA#@Dock=+#zy|rayN}Z2gbd{x_F!uz3NZGkToA- z$l<-Db7a4>n&i=k#Y!6J$?HxnXIZFC4a6)5xjaW?=Lxq?)?`zk3;Hfwm? zI}94|F>dog4&DR!+&m9wVQpK7i{rcJx#=Bp9eZl{aM}LNkjZD)0RP_o<~hebdkClh oubpZ@hx^ie^H}-+TZ)10;=yuEo?olC`lWsvUwu5(qv~3I0rNT0sQ>@~ diff --git a/indra/newview/skins/default/textures/map_event_adult.tga b/indra/newview/skins/default/textures/map_event_adult.tga index c344fb1e78887afe2b20ac4830ffb057772416cd..f548126e5a98bb1c831872dd054ccb540a7eb170 100644 GIT binary patch literal 1006 zcmX|=Ye-XJ7{_PKEj{Yl+2*#Enb`~rWf{&3)hrx}X(D)8LsHYQq%u|(BXG`HrbT`T zq@XNHBD+Af%(O2Wso94RBFlpA^eL(jMS+*|?|Dwy3;(@)-}C&Q=l|YRsz}vB)2Vc- zgoGduBUWW@*pQICX3Au-&O}8;$%VE15E&UMOR?rzVVUiPN-(%6POC(V3mKBuIz}b;kf4?l+=|2I3$udV!g<7j!ELU!?LZIimQi+kH%!J>Z{Ep+HF?jYIP|RvH z8kvx$aQZ=Ybv0^hYvFA>NkO9+ehUN{(>!<$1g;KZOX)UbW@f_SaDWL?d$?AsmD#`B z?FR3%x3e49o__g<_CEQH>VwV7{$^xkz;3sL2|`baf@GNC$>QQ-6c!eu`Em&Nr)M!p zy7c&y()UmO#-TG;!Es!dPg}1y@Jic7?b4Mm;^X6ypP!F{qOIuY9|u=#?HfX6<6-z| z>v|_XEAu(7JSBnIY=+Tj{7MO$M3tb=;}c_Bo`(JC8GQq9*Eu*hZB{I=-{{2dU>DAe zOvByaMN(1{RoBaEwYr}YRPY_sMi^p4F)^ZC*W3yBu0~{MXa8R>TV`!3uSAuv4bjoj zvdLunK%9?cU%2H`lw=%Ux_pJq_IQo#C_OzLsi~<*OiX0UFk37#U5`%$@)OA;2@46r zXkaE=K5N{vZHT#c^DQ)DQeni34v65mBNO7&s5J7=kB|kc>NQsB<1b{;JG(`eWoFh_wh%Qi zWSm1;soJ&cO)Y)5H&OHj)-sG%vU!kzJ6zAL7l5QDl+Zn@JaVB{luRfU+1dHENiIy0 YF#2#F?j9#k&3$uwbMk!EOed%I2Uv>&3jhEB diff --git a/indra/newview/skins/default/textures/map_event_mature.tga b/indra/newview/skins/default/textures/map_event_mature.tga index 61c879bc923c7d1ee625a3995012a3ddecca363d..71067c0dfdb0ea442fa4a9037cd1e138476d9f31 100644 GIT binary patch literal 1068 zcmY*YYe-XJ7(Tl+FWJ&Fr_P-7{glUgX-E2n6Epr8^t`~vm`ffhfIb8Q?N`$s5~(?=FH zSROjLV9rwH76;T9`e8g5g4XIovh63z--qGwL{K#thOXuZ;*6gm90?%vdOzfR@-T5( zEmmb&OOMii2#L={2#@G);Rv*rAK)!s2!}_JU~yyls$ne4a$(bxS>z8!5LdlF%q>wl ziC?a;lzE~~IH7(jB8fEg_8@dcBS_BoLA%Zijl~0g%{TCcZmfP6!HU-+_|s0Xo)W*F z`W@!)4nhA+gz=?_jLr$9Z3!TClOHKXR7-&uiB=DE?Z2?>iHN0-Ma1+BEzE`ZO>9Ov z&*xAyAi{ip8tL1|pf3+1t&B8E{gjIjN%>yzdEcSE9D;`4Q9qgkjoA&}=7KU~<5%Kah1!F?mc|a;bVqRC7r{e+1PwQ4VW=aG8q%m5 zh55$JLVsB83~XM^r^MH-J#aKz*ihm-ey1M;W59jZ@KhvQsnKD77xuySt*jSs#c_dNNd<`9@qnb)OvrT<5Yj?Sam z+gcCyt|_s(d41M=TJvix)fvL-^<|#utt~yw>%>(`_gR!y|E`KszffM2HZK3jQHtAyy*d1tj;;(i_?46l>nFZyA)&XofXp?iFV6=-Z<3JkIoFJ>+-}d7Q~;U+Q(n9pQeo&gKu{k#!wf z&B`3y{rTi|WXb6>z6T6EJbS-cJ%@W&)xcv{u)>$Wn{^@c_#N2ag|3G@eV9e7Sn+V4 z)G+IN;5&M<4?Wzj>^I5U1Mf{3t?~RHv*`nmy4i!_O#Z)QbgtvU^4YAm$u3=|%SCTL IO|ztLzMf}`#Q*>R diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga index 7478de371aaec5d55f0f01405b45a2d6589261d5..acaaa3db447f9066bebe414cfeb47fca5e583bef 100644 GIT binary patch literal 1068 zcmXw2ZAep57@j(HbN6m{x~rSItIO1a3d_yD2&&PCm6hgHFs#`s3M(r`QbPO2s0jMB zGR5ztTpw6b1pP4zY7st)J?}6y)5!lGF1uXK^())%T&k`x9E9jiIUk6RKMJP_U*N za%TQ7L7s7w@{6W4;wb7(ww!HJy65*I{}6U{GSm&KXuPYUd054fM`7@N>7gJJ7585u zc_!E3bvX0}bEcG*|JA*D2&HEjsxC9^XlK~d!*F0Ati|>A_cPRVGc4UX1WQ`}ub6Nz zd1A_}ql&v4>rODNKgD25y9Sf}DopYP1g}q33u%3ZYYDLjWrui&CI7;76MtomXv>v6c{}8yuV0LxEJgtY& z1(EMFI>WW3UV-3fgW1up@z);v2hQXE@uK}t@!?S%=uqL^8iF-@5E94q0a&sKu3ngx zZdjBaxQj#JJ%;@i?(a1vWsNMU>P2(Eii;0b6m5Ttq}+Q*%ng#(ZAe+SNTUafd?Q*f z6=xZ={+;u`5kJphPTimB-ZF9Oj*4rK$1(hR5|#Vj!!~o6H12BktlIJt{Jy4b9F^z8 z|KF-C93(!UWjP_y^`@jYh_2@<9==u)`Z9??{Rh})48ylOq@AA*s#=fB0z>rg-9PxO z6W7RRm}X&>Xv_ZMZwzYwFFsCc8a(oPI-aSTe^E^kNs8w;pLOC2gs8|H(8r6b1>3Zc z+q-q5;bb2=AAH9BSK~N8@EQJwKFnQKjpPjXS5eN{#(fFV5pE>XnQRd4wU*@RBcf#g vqrE@bIhL%$jKw8XcftZ-A|hV`>6Ru-;XF-P|wgXZC& literal 1068 zcmZQzU}As)0R{mE1r8@W8<4<%Qn9p@6hAcna^n=0%*?;)hAhj_6!@{O91`@vb^nv6+dO>PI`ao#_ME~0c z3420j!1RL50qKF+4U1opI4(1g^}^JHXjmG8r9*6HpzB4}gU$w-iEIWbdSPZEn*s6< v$UJnn!qnoRbzo+Yp%F=i-;pXY%s>c8T`M$$R diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga index d0134fa5fe737492c87317e95b38789b0ffc76dc..545b8e532c3a85f3ebc99c642c69ce9c5a2e1eb1 100644 GIT binary patch literal 1068 zcmYL|e@s(X6vxkfeK2q+Y}L}HqS8iWG?b=vqg4ddS;wSIhuxegE@XerNR}-7hm38; zWU_yj;Qm-LhekrsncyE|%d$<8L?LrsL4Fv-N(j2>km=gKzW$()@6KCnc9T!eyZ4^Y zIl1?}M6<7UCchl|14^AZC%^X&UnvU!E1Sk{j~qX_i3u} zbxK-_39?MES_u0aDg99!-S_RG&pFS_lxX>x8vLC5UNd#QT0`;HBZR(lgu9c3ltKvI z=6MgH^(eu+la`LR(h%qS7_CM&BOh!OpKPt9RDZWXdVzUDSPm0bqW`1KFZU9*yJ@-g zZTgixFJtmJ#g=VO@$}MH0?B(4Qu6{!4+VZP5q>lizF$vBFER^+rALJRZbF@#;*~b) zVBfLBCAwOC5@LVIP$zXr%*aU2${5*57%C(T8u=U#nET8eAsHgP+eGlcMnU#>RhCLK z-5ps_Mph#hd=ct|9`R{CZkYuFdctpO*_jbsmzgFc_+HL;5^7x(W`Cb~ok)%LtVQ^` z70T~6#BSN4PT3JMNSIzjn93)_Cssop(?Jair~$%cKVgHBR@nE;I>O@5HiU1~AR6!? zHhzHpCOpa|JXl4TXJWyPh~3PGGAu#4E)c%P@0LBSf1y504PI~~a`OP; zw>vR0a1>`xzKkP#^?0Q$>v6SRYSa2MQpU|hkH=%)v(xpZ+iAVK-c*p1brOn<&!?-( oUzn|Pt?9B^ayGLkXY#d}83*3cGV(p zx+p9v`j1|8UtkfIHN%S$TJy%O7{n5jP3F^c_U+3B8$5jPd(QJa?|J`Bq(rP=g;YpQ znKiS%c9Hc>C33uZjXdz$WL%|VjcLyE75mnS_*&M<_tao5Fxd*sdrW<5g~l|eo?>jh z$ki{tO5jHakUc>@_`g<8=5p#$Z($9s8TFIRbOB2N@&hK@RtD@4bBxPoF5^SgZ-do` zVG~%uO47!h@L0Z)GA-k8nH)=MX9IsT&MR8knn))$76Q+fQ0gl{o^C6d@cEJ5A!^0 ztH=dv(NZ(!R4fQU!M_v{%cc1h3)Cl|M9`%mMu>a9*rP7-XyLh&K z#?RBEXQlm)1HZ?c}H^>0KNYvD#Eu2&b5BF3$c&` zWO@tV;AWBVjMn(=QmMw&6cw*=P>TK-~R{zvWGc`p0b%4qjS`AkJP9^*OpG3O}8Xv}lCqveRvZX7ze L#k=2dw=~LM<32n4 diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga index ef63a3eb7288fb2908770980dc9080460bc9c140..545b8e532c3a85f3ebc99c642c69ce9c5a2e1eb1 100644 GIT binary patch literal 1068 zcmYL|e@s(X6vxkfeK2q+Y}L}HqS8iWG?b=vqg4ddS;wSIhuxegE@XerNR}-7hm38; zWU_yj;Qm-LhekrsncyE|%d$<8L?LrsL4Fv-N(j2>km=gKzW$()@6KCnc9T!eyZ4^Y zIl1?}M6<7UCchl|14^AZC%^X&UnvU!E1Sk{j~qX_i3u} zbxK-_39?MES_u0aDg99!-S_RG&pFS_lxX>x8vLC5UNd#QT0`;HBZR(lgu9c3ltKvI z=6MgH^(eu+la`LR(h%qS7_CM&BOh!OpKPt9RDZWXdVzUDSPm0bqW`1KFZU9*yJ@-g zZTgixFJtmJ#g=VO@$}MH0?B(4Qu6{!4+VZP5q>lizF$vBFER^+rALJRZbF@#;*~b) zVBfLBCAwOC5@LVIP$zXr%*aU2${5*57%C(T8u=U#nET8eAsHgP+eGlcMnU#>RhCLK z-5ps_Mph#hd=ct|9`R{CZkYuFdctpO*_jbsmzgFc_+HL;5^7x(W`Cb~ok)%LtVQ^` z70T~6#BSN4PT3JMNSIzjn93)_Cssop(?Jair~$%cKVgHBR@nE;I>O@5HiU1~AR6!? zHhzHpCOpa|JXl4TXJWyPh~3PGGAu#4E)c%P@0LBSf1y504PI~~a`OP; zw>vR0a1>`xzKkP#^?0Q$>v6SRYSa2MQpU|hkH=%)v(xpZ+iAVK-c*p1brOn<&!?-( oUzn|Pt?9B^ayGLkXY#d}83*3#*mx`sLP+Rc@9DEHGH=TV0U!hAK1Yf|{=OVIL!C%Wx0423Oy3Eq|JBfJRxlak z@$b|C%bDKhAUosu%Zts2zPI!|+#V(I*fZT9AKWv1qdrM}}cr_>R=jThYE*@{d)F2)j=mUWqdedQ>K{-Fv)BLcnn;*SH_~3QK zV>XmW4b@kDc`wA+JXi6^kp|~o_nKO$C%!35THsu4ajsSzCH^W{28(%rJqc$1Kzsm2 Cw#T{v diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f4a239be62..5e2105206d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,19 +1,19 @@ @@ -707,7 +707,6 @@ with the same filename but different name - diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index c60cc163c8..c0eca91a46 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -4,7 +4,7 @@ can_resize="true" center_horiz="true" center_vert="true" - height="600" + height="535" layout="topleft" min_height="520" min_width="520" @@ -17,79 +17,166 @@ width="800"> - + - You + left="15" + name="events_label" + top="3" + width="215"> + Legend - + + + - Home + name="person_label" + width="90"> + Me - + - + + Person + + + - Auction + width="16" /> + + Infohub + + + + + Land Sale - Land For Sale + left_pad="0" + name="auction_label" + top_delta="3" + width="100"> + by owner + + + land auction + + - + - - - - - - - + name="Home_label" + width="70"> + Home + + top_pad="9" + width="66"> Events: - + - + + + PG + + + + left_pad="0" + width="16" /> + + Mature + + + - - + + Adult + + + + + + + Find on Map + + + + + + tool_tip="Show friends on map" + width="182"> - + width="182"> - - - - - Search Results: - + + width="193" /> - + + + + + + + + + + - - - - - - + left="20" + mouse_opaque="true" + name="zoom_icon" + top_pad="7" + width="16" /> + width="200" /> + diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml deleted file mode 100644 index bffd84877f..0000000000 --- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - Region: - - - unknown - - - Version: - - - unknown - - - Type: - - - unknown - - - - - - - - - - - - Rating: - - - - - - - -