From 9f84a348ca08dd0487b2a7dff13da905fd8e11bd Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
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 | 714 ++++++++++--------
.../xui/en/panel_region_general_layout.xml | 242 ------
13 files changed, 426 insertions(+), 545 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(V3mKBuI<A;4
zOXgBiQczM-0&jB=9idU|sN0F$++5gfHi&w|e7I=rBSs=EVpd78-0tW##+v5K%gfQy
z(t<!BfMXYL;KJB@965O!_4W1ecs$6;%7UoV$(m?gh*&czOf+TWWb2Kwv!$h_@caD=
z9B6Gt$DK#G`}`Mzy|+<QQ-iXyG87aPAT2EoF*<3U;JqYCloHoWCMU0k&*%G}pso8n
zE{=b|$UC63|1s*lhf!2i1eePNr_%|m)ruI&@R1VO!))tv=31@{AlP|t0&2zvUe4el
zp|_s>z}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{vZ<It91VK3@?&IR(WU~H~9@`Mbab<@2mj8Vw{D&I98-71_QU$4r)J{6}
Nujet(^LK%yv_HhXhS~rC
literal 648
zcmZ9JOG*Pl5Qb|e2E<j4;01K&N*6(hFc=hkA(BOKB_duRWYO)Iv&36@ld`_QXOfs+
z%vAl4s_JU9BkRw|Ms|Fd#+MgDJXL1?O{xgc#qLP_{jKN<fg^$Ki32zHpS9;@9g0C@
z_B(qi=~kO*7Nj{c4*%@Sh1Weo3+eQ!cf~E53fq5?y2GvDY(r}1id5G?p{^QIQ4)qi
z+F`dF>HT#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{<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/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{<R{TASI>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;i<EJWW
z)+?26YA>B>Amx)%`20VtK^>RWph;aeZgkcny~~5*Cxh5L7C^pl5SBI%A_}(#)Y0Z4
zp;C1aTN2Kpqo`FUFWgD&MBHI73f{>m{|vasflXh5E#H93F<`Y{hPBfRZA{{qa1O2`
zR&7n6t4UiqZfx-)<C%<AZ)D`YmEm|Vqhy5iLB_g|GMpa(`=E@ZE-%!km?2`hmn^Nl
zvRhkNgPDC2to;&p7YQ^L2-K|pUtHVL7cwFpTLWT>&O>~zCeuDLb*~4;I}*&4qk3~1
zUbhO|atoZO5@;?JI9L|SHSej6_(u{<%^vVfi7%yj2TbP%kZ@l@@<R#vSAA%3B?NPv
zsupM|53$Rx^ke#M3Da&#Fmw+D_d<LH?`VGCZ>;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#<r#u>k`}OuCreFz5~yH02l7wz`nW_
z!QNYrH=^+JV<bJG+Ub6MGwq*z%3delz#h)7s&}U@UjC!A_X<XTg>rBm+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*!e4<anYusAa>3LfT<qh=Y?SlVX5~IwfvxD%94Y0a`8B
z&`lBN;-rQwZ!F5SbQB;M)Y*`0LEeIa&P&D_Sorw<FqUIh-}e09^?AR`|0*?2O%_k(
zsRG?5dsFIg>2DNv2_FetgcpSWE6>P+Dwjo3!?U)Q;$3nCubp2ov#=bO)fpqoFXXh$
zFZ!1tk<)$ruXv?xC%C$e#dU+Ms2{@IG(>vaU6Puw6SV(Z+><f~o!n={PKhyZx=+9r
z-Qi}!TSf^xa|vCk4Ue_iIIm2>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*TE<tHxtRYmXc}Gt@nL$vati8y8PaS2Gi<y2
zpCPU0KZBggUzi#uEu*V4*){)tu6_A$dimRb&hx+iGo)4n%`v(HGJ}bO>tEg3d;d4T
z`SHK=@prHqkU1c`K=Qn5IuBzj>p|@Qn_vI<?{nqTe};^@{|wqDVEr;OGUh<L{>N6-
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-^arDOionN<T>B93F-G>@caRI}DLH4ZwRTcU>cKo5!>zRw_%H|mN4>B}J*bBe
nQ1AWNBk>Logk8wL_T$dq`|p?yRO{n4z1`C-@w&~<PdEAiwL(^`
diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga
index c229b379a2c9797fba482051e98a157896d77368..2c06d08fd26fb590ac0a3955cb6a0e7456aa2339 100644
GIT binary patch
literal 1068
zcmYjQ4NQ!27=Q0N*Y)Ant`AO>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)<yc1b+P>!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@M1fFsqBxBLd<vHH@P
z?j~)$5qFO!psqLzTEllN>ERJhb%pv19`gul=|=}?<Xk9+EvwJ`LH&oWSvG9UQDS%t
zH-+mbGvVLM!~Yo%pGPJ%@7GS<vAmM)VX&L4>L<RRM@)K^Z$bvn4_I(x$b#k(3z{0r
zQCpme)lW>gcR-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>X<wtgu)rX#I0+FXEw4^w3iJLVd8(TVEmLeAE3x
z4A}((Lz0>KeKSdRMNWicAOjhm-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?)?`zk<x&H@zZ>3;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(V3mKBuI<A;4
zOXgBiQczM-0&jB=9idU|sN0F$++5gfHi&w|e7I=rBSs=EVpd78-0tW##+v5K%gfQy
z(t<!BfMXYL;KJB@965O!_4W1ecs$6;%7UoV$(m?gh*&czOf+TWWb2Kwv!$h_@caD=
z9B6Gt$DK#G`}`Mzy|+<QQ-iXyG87aPAT2EoF*<3U;JqYCloHoWCMU0k&*%G}pso8n
zE{=b|$UC63|1s*lhf!2i1eePNr_%|m)ruI&@R1VO!))tv=31@{AlP|t0&2zvUe4el
zp|_s>z}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{vZ<It91VK3@?&IR(WU~H~9@`Mbab<@2mj8Vw{D&I98-71_QU$4r)J{6}
Nujet(^LK%yv_HhXhS~rC
literal 648
zcmZ9JOG*Pl5Qb|e2E<j4;01K&N*6(hFc=hkA(BOKB_duRWYO)Iv&36@ld`_QXOfs+
z%vAl4s_JU9BkRw|Ms|Fd#+MgDJXL1?O{xgc#qLP_{jKN<fg^$Ki32zHpS9;@9g0C@
z_B(qi=~kO*7Nj{c4*%@Sh1Weo3+eQ!cf~E53fq5?y2GvDY(r}1id5G?p{^QIQ4)qi
z+F`dF>HT#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<g}%&txQwXvY9%wspYksW&ZGoMi4|05nUmI=t9ts
zh?HOw1ooppU7#xnMg0gVuqCy%mRnQQc^zj@?`NK<4<265_kGXvy_e^3oSc(ZJQvSp
zL<8U?&`AtIN3asg3H5}g#mK(dK08-Q94XRXoJ<v6EK5qiCD)sVWr-{1IfW83wPsot
zul*!bMfK60ZbBs?o8AA18zWE6>{glUgX-E2n6Epr<E;yO{b5uNxL~;CM67*(Sdl1v
z<z%v}#C0rcs3<Ds#&w+vQ^8cK;~R2Ljid1=&>8^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;`4Q9qgk<FWTuDTevtdoGx|
zrXkc#z~C51x}7vC{@2jvd6AIoMndN(V%hu5A5_22aWR<H5kltfDG1FW2s<ZXs3i@S
zN98EeY?R05KY1_>joA&}=7KU~<5%Kah1!F?mc|a;bVqRC7r{e+1PwQ4VW=aG8q%m5
zh55$JLVsB83~XM^r^MH-J#aKz*ihm-ey1M;W59<A;1&61Weep&8pgJ9*xrc9d_i?n
z|DsRR{7nS`=5^x7Fb|iubsaP16;531djQ|;AC2OZ)Q^TqlwO%Z#aj{CG@IBn3*0H@
zb>jZ@Khv<ccOA17miTtHb>QsnKD77xuySt*jSs#c_dNNd<`9@qnb)OvrT<5Yj?Sam
z+gcCyt|_s(d41M=TJvix)fvL-^<|#utt~yw>%>(`_gR!y<F2NP=IVy(x>|E<W%Z7V
GwcKwJulFth
literal 1068
zcmbW0Jqp4=5QW#+Smp>`KszffM2HZK3jQHtAyy*d1tj;;(i_?46l>nFZyA<If`MVO
zGw*vdS<#rt@QF=qx}EW4WDw<JTP|1&GyBknJ=E;=B0(KBJhT6ke?9Hzc(CtzCebcE
z5vb{?;xP+#=<>)&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
zGR5ztTpw6b1pP4zY7s<aLH{Bu=uZ);=lb-XJ9psWJ@=gVd7k&Zyho>t)<u@2lXRH|
z06Gp@{K`mh5b_9K!bXB`D)MiB&hO(QyeV!Joe8l9X|YvVa7%U-e6z?3i;mI5nxe4u
zT+ese<$0oy6KW}MB_W6BM>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<k|zrkP-S`eSmplO$#W8nExdcjlj_nPgq
z-_0xU)%Yc?3_?abg!Jn$IW8e^g~3nt7|q9FFg2n0bl8LEQ@`JdztL!MjxDbnMLE^(
zzrgt&5D6w{8*1BC>}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%<d1p<Xbu^Y{opSV%d>$jKw8XcftZ-A|hV`>6Ru-;XF-P|wgXZC&
literal 1068
zcmZQzU}As)0R{mE1r8@W8<4<%Qn9p@<bRM}nErnk68@8dLG~f*UscKQ9~Wk1WcUxl
z$nxm=|8Hmgj|;>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%<Pfk;4~<JwPQ85E2yX8s-`7>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?}M<h{Z6i@+e$^k$cJhZJ`#>6<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`O<B@iwT_?TF8G
z;7M^l9-DHoV0;d-fScW7M27MZ9h5NMD^O&hW$pZBmb}sK6IF<geE{{&7f8&VL1Mm#
z<2Q(hPVt={<Gb}CI&4RDXdNO~bU6F5Ky?NE&A!84qVH&KC|On}K0|!=TO=P2AhmE6
zch0ooa-9*uPiqkyeFxDI5BE2-pN*D!fre`OiG7p7U?{Yg8bcRPA4Ytx7pcDnk^W~4
z1ADjNoR!eyTm@yUh5c&wH=yrCHmYpm=}Vi$4)$}kZ`fIG^;eV?Eq?d)aU}ly;lCR9
zF0|uPtpR~fFO*<2BEwtJcTx{msif98L_52AjL7^0+uV*rt_sV1i+}sd`P0WRdF>P;
zw>vR0a1>`xzKkP#^?0Q$>v6SRYSa2MQpU|hkH=%)v(xpZ+iAVK-c*p1brOn<&!?-(
oUzn|Pt?9B^ayGLkXY#d}83*3<?|!Skss4?|@`K*`hTV4h7X$18Q~&?~
literal 1068
zcmZvbUr3W-6vhvFkw}E(Fxk401UIxa3c84}B1}IT1vzt2GS?rL*04chQ5RM>cGV(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~<ulf;qax_`)KE&&)enO$UER77L9nPUz0Bs&qRk+`xvmq2=`&g^-qpT02l(&TrO
zZJ?qz7<)zCWDoRkf66Gkr(B+4x-H-L6?#Ufw<h15=V$LQHbLDZdyU@Hz_bCfFOF`I
z3Cy>%uO47!h@L0Z)GA-k8nH)=MX9IsT&MR8knn))$76Q+fQ0gl{o^C6d@cEJ5A!^0
ztH<K2WpZ!1JV(@E>=dv(NZ(!R4fQU!M_v{%cc1h3)Cl|M9`%mMu>a9*rP7-XyLh&K
z#?RBEXQlm)1HZ<A88UcHJ*Jpb&$1uNY%P_bQ7KgePWg#cC$PvjlDSCVExr}r!%nW<
zNJV*OdZ(IOWS=Q7`kj&_TdnWNDH4dCbFePo&jM>?c}H^>0KNYvD#Eu2&b5BF3$c&`
zWO@tV;AWBVjMn(=<vKp9hwE~!Def!Hv(0qpa$oy$Y`BoM#x9Yw2dX5V8E)Xd-Sl%$
z3#>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?}M<h{Z6i@+e$^k$cJhZJ`#>6<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`O<B@iwT_?TF8G
z;7M^l9-DHoV0;d-fScW7M27MZ9h5NMD^O&hW$pZBmb}sK6IF<geE{{&7f8&VL1Mm#
z<2Q(hPVt={<Gb}CI&4RDXdNO~bU6F5Ky?NE&A!84qVH&KC|On}K0|!=TO=P2AhmE6
zch0ooa-9*uPiqkyeFxDI5BE2-pN*D!fre`OiG7p7U?{Yg8bcRPA4Ytx7pcDnk^W~4
z1ADjNoR!eyTm@yUh5c&wH=yrCHmYpm=}Vi$4)$}kZ`fIG^;eV?Eq?d)aU}ly;lCR9
zF0|uPtpR~fFO*<2BEwtJcTx{msif98L_52AjL7^0+uV*rt_sV1i+}sd`P0WRdF>P;
zw>vR0a1>`xzKkP#^?0Q$>v6SRYSa2MQpU|hkH=%)v(xpZ+iAVK-c*p1brOn<&!?-(
oUzn|Pt?9B^ayGLkXY#d}83*3<?|!Skss4?|@`K*`hTV4h7X$18Q~&?~
literal 1068
zcmb7?u?oU45Qc-3V^=pv7X>#*mx`sLP+Rc@9DEHGH=TV0U!hAK1Yf|{=<I6jA9Cf4
zO=AN`)60E-{yQQ>OVIL!C%Wx0423O<N{O(Y*X6<O_K}LF8mNEE>y3Eq|JBfJRxlak
z@$b|C%bDKhAUosu%Zts2zPI!|+#V(I*fZT9AKWv1qdrM<IXb0fAcr1wWaNYH<!95&
zUGa}xN(6KaUg>}}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 f4a239be621..5e2105206d9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,19 +1,19 @@
<!--
This file contains metadata about how to load, display, and scale textures for rendering in the UI.
-Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
+Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
to them by filename (relative to textures directory).
-NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry
+NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry
with the same filename but different name
<texture
name="MyTexture" (mandatory)
- this is the name you reference the texture by in XUI. For example, <button image_unselected="MyTexture"/>
file_name="images/my_texture.png" (optional)
- - this is the path to the actual file asset, relative to the current skins "textures" directory.
- If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.
+ - this is the path to the actual file asset, relative to the current skins "textures" directory.
+ If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.
NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly
preload="true" (optional, false by default)
- - If true, we will attempt to load the image before displaying any UI.
+ - If true, we will attempt to load the image before displaying any UI.
If false, we will load in the background after initializing the UI.
use_mips="true" (currently unused)
scale.left="1"
@@ -23,8 +23,8 @@ with the same filename but different name
- Specifies the segmentation for 9-slice image scaling. Specifically, the pixel offsets from the LOWER LEFT corner
that define the region of the image that is stretched to make the whole image fit in the required space.
In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up
- and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left
- corner. The end result is that the image will keep a 1 pixel border all around while stretching to fit the required
+ and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left
+ corner. The end result is that the image will keep a 1 pixel border all around while stretching to fit the required
region.
-->
@@ -707,7 +707,6 @@ with the same filename but different name
<texture name="icon_groupnotice.tga" />
<texture name="icon_groupnoticeinventory.tga" />
<texture name="icon_place.tga" />
- <texture name="icon_place_for_sale.tga" />
<texture name="icon_popular.tga" />
<texture name="icon_top_pick.tga" />
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 c60cc163c88..c0eca91a46d 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,389 +17,493 @@
width="800">
<panel
filename="panel_world_map.xml"
- follows="left|top|right|bottom"
- height="565"
+ follows="all"
+ height="500"
layout="topleft"
- left="15"
+ left="10"
name="objects_mapview"
top="25"
width="542" />
- <icon
- follows="top|right"
- height="16"
- image_name="map_avatar_16.tga"
- layout="topleft"
- left="-230"
- mouse_opaque="true"
- name="self"
- top="34"
- width="16" />
+ <panel
+ name="layout_panel_1"
+ height="22"
+ width="238"
+ follows="right|top"
+ top="25"
+ left_pad="5"
+ background_visible="true"
+ bg_alpha_color="DkGray2">
<text
+ text_color="White"
+ font="SansSerifLarge"
type="string"
length="1"
follows="top|right"
+ halign="left"
height="16"
layout="topleft"
- left_pad="4"
- name="you_label"
- top_delta="0"
- width="145">
- You
+ left="15"
+ name="events_label"
+ top="3"
+ width="215">
+ Legend
</text>
- <icon
- follows="top|right"
- height="16"
- image_name="map_home.tga"
+ </panel>
+<panel
+ follows="right|top"
+ height="126"
+ top_pad="0"
+ width="238">
+<button
+ follows="right|top"
+ height="22"
+ image_overlay="map_avatar_16.tga"
+ scale_image="true"
+ left="4"
layout="topleft"
- left_delta="50"
- mouse_opaque="true"
- name="home"
- top_delta="0"
- width="16" />
- <text
+ name="Show My Location"
+ tool_tip="Center map on your avatar's location"
+ top="6"
+ width="24" >
+ <button.commit_callback
+ function="WMap.ShowAgent" />
+ </button>
+ <text
type="string"
length="1"
follows="top|right"
- height="16"
+ halign="left"
+ height="13"
+ top_delta="6"
+ left_pad="5"
layout="topleft"
- left_pad="4"
- name="home_label"
- top_delta="0"
- width="145">
- Home
+ name="person_label"
+ width="90">
+ Me
</text>
- <icon
- color="0.5 0.25 1 1"
+ <check_box
+ control_name="MapShowPeople"
follows="top|right"
height="16"
- image_name="legend.tga"
layout="topleft"
- left="-230"
+ left="3"
+ name="people_chk"
+ top_pad="9"
+ width="22" />
+ <icon
+ color="0 1 0 1"
+ follows="top|right"
+ height="8"
+ image_name="map_avatar_8.tga"
+ layout="topleft"
+ left_pad="3"
mouse_opaque="true"
- name="square2"
- top="54"
- width="16" />
- <text
+ name="person"
+ top_delta="3"
+ width="8" />
+ <text
type="string"
length="1"
follows="top|right"
+ halign="left"
height="16"
+ top_delta="-2"
+ left_pad="7"
layout="topleft"
- left_pad="4"
- name="auction_label"
- top_delta="0"
- width="145">
- Auction
+ name="person_label"
+ width="90">
+ Person
</text>
- <icon
- color="1 1 0.25 1"
+ <check_box
+ control_name="MapShowInfohubs"
follows="top|right"
height="16"
- image_name="legend.tga"
layout="topleft"
- left_delta="50"
+ left="3"
+ name="infohub_chk"
+ top_pad="3"
+ width="22" />
+ <icon
+ follows="top|right"
+ height="16"
+ image_name="map_infohub.tga"
+ layout="topleft"
+ left_pad="0"
mouse_opaque="true"
- name="square"
+ name="infohub"
top_delta="0"
width="16" />
- <text
+ <text
type="string"
length="1"
follows="top|right"
+ halign="left"
height="16"
+ top_delta="2"
+ left_pad="3"
layout="topleft"
- left_pad="4"
- name="land_for_sale_label"
- top_delta="0"
- width="145">
- Land For Sale
+ name="infohub_label"
+ width="90">
+ Infohub
</text>
- <button
+ <check_box
+ control_name="MapShowLandForSale"
follows="top|right"
- font="SansSerifSmall"
height="16"
- label="Go Home"
- label_selected="Go Home"
layout="topleft"
- left="-90"
- name="Go Home"
- tool_tip="Teleport to your home"
- top="34"
- width="88" >
- <button.commit_callback
- function="WMap.GoHome" />
- </button>
+ left="3"
+ name="land_for_sale_chk"
+ top_pad="2"
+ width="22" />
<icon
- color="0 1 0 1"
follows="top|right"
- height="8"
- image_name="map_avatar_8.tga"
+ height="16"
+ image_name="icon_for_sale.tga"
layout="topleft"
- left="-226"
mouse_opaque="true"
- name="person"
- top="84"
- width="8" />
- <check_box
- control_name="MapShowPeople"
+ name="landforsale"
+ top_delta="0"
+ left_pad="0"
+ width="16" />
+ <text
+ type="string"
+ length="1"
follows="top|right"
+ halign="left"
height="16"
- label="Resident"
+ top_delta="2"
+ left_pad="3"
layout="topleft"
- left_pad="8"
- name="people_chk"
- top_delta="-4"
- width="110" />
+ name="land_sale_label"
+ width="90">
+ Land Sale
+ </text>
<icon
+ color="1 1 0.25 1"
follows="top|right"
height="16"
- image_name="map_infohub.tga"
+ image_name="legend.tga"
layout="topleft"
- left="-230"
mouse_opaque="true"
- name="infohub"
- top="100"
+ name="square2"
+ left="41"
+ top_pad="-2"
width="16" />
- <check_box
- control_name="MapShowInfohubs"
+ <text
+ type="string"
+ length="1"
follows="top|right"
height="16"
- label="Infohub"
layout="topleft"
- left_pad="4"
- name="infohub_chk"
- top_delta="0"
- width="110" />
- <icon
+ left_pad="0"
+ name="auction_label"
+ top_delta="3"
+ width="100">
+ by owner
+ </text>
+ <icon
+ color="0.5 0.25 1 1"
follows="top|right"
height="16"
- image_name="map_telehub.tga"
+ image_name="legend.tga"
layout="topleft"
- left="-230"
mouse_opaque="true"
- name="telehub"
- top="120"
+ name="square2"
+ left="41"
+ top_pad="-3"
width="16" />
- <check_box
- control_name="MapShowTelehubs"
+ <text
+ type="string"
+ length="1"
follows="top|right"
height="16"
- label="Telehub"
layout="topleft"
- left_pad="4"
- name="telehub_chk"
- top_delta="0"
- width="110" />
- <icon
+ left_pad="0"
+ name="auction_label"
+ top_delta="3"
+ width="170">
+ land auction
+ </text>
+
+ <button
follows="top|right"
- height="16"
- image_name="icon_for_sale.tga"
+ height="22"
+ image_overlay="map_home.tga"
+ scale_image="true"
+ label_color="White"
layout="topleft"
- left="-230"
- mouse_opaque="true"
- name="landforsale"
- top="140"
- width="16" />
- <check_box
- control_name="MapShowLandForSale"
+ left="136"
+ top="6"
+ name="Go Home"
+ tool_tip="Teleport home"
+ width="24" >
+ <button.commit_callback
+ function="WMap.GoHome" />
+ </button>
+ <text
+ type="string"
+ length="1"
follows="top|right"
- height="16"
- label="Land for Sale"
+ halign="left"
+ height="13"
+ top_delta="6"
+ left_pad="5"
layout="topleft"
- left_pad="4"
- name="land_for_sale_chk"
- top_delta="0"
- width="110" />
+ name="Home_label"
+ width="70">
+ Home
+ </text>
<text
type="string"
length="1"
follows="top|right"
+ halign="left"
height="16"
layout="topleft"
- left="-104"
+ left="137"
name="events_label"
- top="80"
- width="145">
+ top_pad="9"
+ width="66">
Events:
</text>
- <icon
+
+ <check_box
+ control_name="MapShowEvents"
+ follows="top|right"
+ height="16"
+ layout="topleft"
+ left="135"
+ top_pad="1"
+ name="event_chk"
+ width="22" />
+ <icon
follows="top|right"
height="16"
image_name="map_event.tga"
layout="topleft"
- left="-92"
mouse_opaque="true"
name="event"
- top="100"
+ left_pad="0"
width="16" />
+ <text
+ type="string"
+ length="1"
+ follows="top|right"
+ halign="left"
+ height="16"
+ top_delta="2"
+ left_pad="3"
+ layout="topleft"
+ name="pg_label"
+ width="60">
+ PG
+ </text>
+
<check_box
- control_name="MapShowEvents"
+ control_name="ShowMatureEvents"
follows="top|right"
height="16"
- label="PG"
+ initial_value="true"
layout="topleft"
- left_pad="4"
- name="event_chk"
- top_delta="0"
- width="55" />
+ left="135"
+ name="event_mature_chk"
+ top_pad="3"
+ width="22" />
<icon
follows="top|right"
height="16"
image_name="map_event_mature.tga"
layout="topleft"
- left="-92"
mouse_opaque="true"
name="events_mature_icon"
- top="120"
+ top_delta="0"
+ left_pad="0"
width="16" />
+ <text
+ type="string"
+ length="1"
+ follows="top|right"
+ halign="left"
+ height="16"
+ top_delta="2"
+ left_pad="3"
+ layout="topleft"
+ name="mature_label"
+ width="66">
+ Mature
+ </text>
+
<check_box
- control_name="ShowMatureEvents"
+ control_name="ShowAdultEvents"
follows="top|right"
height="16"
- initial_value="true"
- label="Mature"
layout="topleft"
- left_pad="4"
- name="event_mature_chk"
- top_delta="0"
- width="55" />
+ left="135"
+ name="event_adult_chk"
+ top_pad="3"
+ width="22" />
<icon
follows="top|right"
height="16"
image_name="map_event_adult.tga"
layout="topleft"
- left="-92"
+ left_pad="0"
mouse_opaque="true"
name="events_adult_icon"
- top="140"
+ top_delta="0"
width="16" />
- <check_box
- control_name="ShowAdultEvents"
+ <text
+ type="string"
+ length="1"
follows="top|right"
+ halign="left"
height="16"
- label="Adult"
+ top_delta="2"
+ left_pad="3"
layout="topleft"
- left_pad="4"
- name="event_adult_chk"
- top_delta="0"
- width="55" />
- <icon
+ name="pg_label"
+ width="66">
+ Adult
+ </text>
+</panel>
+
+
+ <panel
+ follows="right|top"
+ height="22"
+ top_pad="0"
+ width="238"
+ background_visible="true"
+ bg_alpha_color="DkGray2">
+ <text
+ text_color="White"
+ font="SansSerifLarge"
+ type="string"
+ length="1"
+ follows="top|right"
+ halign="left"
+ height="16"
+ layout="topleft"
+ left="15"
+ name="find_on_map_label"
+ top="3"
+ width="215">
+ Find on Map
+ </text>
+ </panel>
+
+ <panel
+ follows="right|top|bottom"
+ height="270"
+ top_pad="0"
+ width="238">
+ <icon
color="0.5 0 0 1"
follows="top|right"
height="16"
image_name="map_track_16.tga"
layout="topleft"
- left="-230"
+ left="5"
+ top="11"
mouse_opaque="true"
- name="avatar_icon"
- top="164"
+ name="friends_icon"
width="16" />
<combo_box
allow_text_entry="true"
follows="top|right"
- height="20"
+ height="23"
label="Online Friends"
layout="topleft"
- left_pad="4"
+ top_delta="-4"
+ left_pad="5"
max_chars="60"
name="friend combo"
- tool_tip="Friend to show on map"
- top_delta="-4"
- width="202">
+ tool_tip="Show friends on map"
+ width="182">
<combo_box.item
- label="Online Friends"
+ label="My Friends Online"
name="item1"
value="None" />
<combo_box.commit_callback
function="WMap.AvatarCombo"/>
</combo_box>
- <icon
+ <icon
color="0.5 0 0 1"
follows="top|right"
height="16"
image_name="map_track_16.tga"
layout="topleft"
- left="-230"
+ left="5"
+ top_pad="8"
mouse_opaque="true"
name="landmark_icon"
- top="189"
width="16" />
<combo_box
allow_text_entry="true"
follows="top|right"
- height="20"
- label="Landmarks"
+ height="23"
+ label="My Landmarks"
layout="topleft"
- left_pad="4"
+ top_delta="-3"
+ left_pad="5"
max_chars="64"
name="landmark combo"
tool_tip="Landmark to show on map"
- top_delta="-4"
- width="202">
+ width="182">
<combo_box.item
- label="Landmarks"
+ label="My Landmarks"
name="item1"
value="None" />
<combo_box.commit_callback
function="WMap.Landmark"/>
</combo_box>
- <icon
+ <icon
color="0.5 0 0 1"
follows="top|right"
height="16"
image_name="map_track_16.tga"
layout="topleft"
- left="-230"
+ left="5"
+ top_pad="7"
mouse_opaque="true"
- name="location_icon"
- top="214"
+ name="region_icon"
width="16" />
- <line_editor
+ <search_editor
follows="top|right"
- height="20"
- label="Search by Region Name"
+ search_button_visible="false"
+ height="22"
+ text_readonly_color="DkGray"
+ label="Regions by Name"
layout="topleft"
- left_pad="4"
+ top_delta="-2"
+ left_pad="5"
name="location"
select_on_focus="true"
tool_tip="Type the name of a region"
- top_delta="-4"
- width="140" />
- <button
+ width="152" />
+ <button
follows="top|right"
- height="20"
- label="Search"
+ height="23"
+ label="Find"
layout="topleft"
- left_pad="5"
+ left_pad="2"
+ top_delta="-1"
name="DoSearch"
tool_tip="Search for region"
- top_delta="0"
- width="60">
+ width="58">
<button.commit_callback
function="WMap.Location" />
- </button>
- <text
- type="string"
- length="1"
- follows="top|right"
- font="SansSerif"
- height="16"
- layout="topleft"
- left="-230"
- name="search_label"
- top="234"
- width="222">
- Search Results:
- </text>
+ </button>
<scroll_list
draw_stripes="false"
- follows="top|right|bottom"
- height="200"
+ bg_writeable_color="MouseGray"
+ follows="all"
+ height="115"
layout="topleft"
- left_delta="0"
+ left="28"
name="search_results"
- top_pad="10"
- width="222"
+ top_pad="5"
+ width="209"
sort_column="1">
<scroll_list.columns
label=""
@@ -408,35 +512,87 @@
<scroll_list.columns
label=""
name="sim_name"
- width="206" />
+ width="193" />
<scroll_list.commit_callback
function="WMap.SearchResult" />
</scroll_list>
- <text
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Teleport"
+ layout="topleft"
+ left="25"
+ name="Teleport"
+ tool_tip="Teleport to selected location"
+ top_pad="7"
+ width="104">
+ <button.commit_callback
+ function="WMap.Teleport" />
+ </button>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Copy SLurl"
+ layout="topleft"
+ left_pad="5"
+ name="copy_slurl"
+ tool_tip="Copies current location as SLurl to be used on the web."
+ top_delta="0"
+ width="104">
+ <button.commit_callback
+ function="WMap.CopySLURL" />
+ </button>
+ <!-- <button
+ follows="right|bottom"
+ height="23"
+ label="Clear"
+ layout="topleft"
+ left="10"
+ name="Clear"
+ tool_tip="Stop tracking"
+ top_pad="5"
+ width="105">
+ <button.commit_callback
+ function="WMap.Clear" />
+ </button>-->
+ <button
+ enabled="false"
+ follows="right|bottom"
+ height="23"
+ label="Show Selection"
+ left="25"
+ top_pad="5"
+ name="Show Destination"
+ tool_tip="Center map on selected location"
+ width="213">
+ <button.commit_callback
+ function="WMap.ShowTarget" />
+ </button>
+
+<!-- <text
type="string"
length="1"
follows="bottom|right"
- font="SansSerif"
+ halign="left"
height="16"
- layout="topleft"
- left_delta="0"
- name="location_label"
top_pad="4"
- width="98">
+ left="25"
+ layout="topleft"
+ name="land_sale_label"
+ width="250">
Location:
</text>
- <spinner
+ <spinner
decimal_digits="0"
follows="bottom|right"
- height="16"
increment="1"
initial_value="128"
layout="topleft"
- left_delta="70"
+ top_pad="0"
+ left="25"
max_val="255"
name="spin x"
tool_tip="X coordinate of location to show on map"
- top_delta="0"
width="48">
<spinner.commit_callback
function="WMap.CommitLocation" />
@@ -460,7 +616,6 @@
<spinner
decimal_digits="0"
follows="bottom|right"
- height="16"
increment="1"
initial_value="0"
layout="topleft"
@@ -472,89 +627,58 @@
width="48">
<spinner.commit_callback
function="WMap.CommitLocation" />
- </spinner>
- <button
- follows="right|bottom"
- height="20"
- label="Teleport"
- label_selected="Teleport"
- layout="topleft"
- left="-230"
- name="Teleport"
- tool_tip="Teleport to selected location"
- top="494"
- width="90">
- <button.commit_callback
- function="WMap.Teleport" />
- </button>
- <button
- follows="right|bottom"
- height="20"
- label="Show Destination"
- label_selected="Show Destination"
- layout="topleft"
- left_pad="10"
- name="Show Destination"
- tool_tip="Center map on selected location"
- top_delta="0"
- width="125">
- <button.commit_callback
- function="WMap.ShowTarget" />
- </button>
- <button
- follows="right|bottom"
- height="20"
- label="Clear"
- label_selected="Clear"
- layout="topleft"
- left="-230"
- name="Clear"
- tool_tip="Stop tracking"
- top="518"
- width="90">
- <button.commit_callback
- function="WMap.Clear" />
- </button>
- <button
- follows="right|bottom"
- height="20"
- label="Show My Location"
- label_selected="Show My Location"
+ </spinner>-->
+ </panel>
+ <panel
+ follows="right|bottom"
+ height="22"
+ top_pad="0"
+ width="238"
+ background_visible="true"
+ bg_alpha_color="DkGray2">
+ <text
+ text_color="White"
+ font="SansSerifLarge"
+ type="string"
+ length="1"
+ follows="top|right"
+ halign="left"
+ height="16"
layout="topleft"
- left_pad="10"
- name="Show My Location"
- tool_tip="Center map on your avatar's location"
- top_delta="0"
- width="125" >
- <button.commit_callback
- function="WMap.ShowAgent" />
- </button>
- <button
- enabled="false"
- follows="bottom|right"
- height="20"
- label="Copy SLurl to clipboard"
+ left="15"
+ name="zoom_label"
+ top="3"
+ width="210">
+ Zoom
+ </text>
+ </panel>
+ <panel
+ follows="right|bottom"
+ height="30"
+ min_height="30"
+ top_pad="0"
+ width="238">
+ <icon
+ follows="left|bottom"
+ height="16"
+ image_name="Zoom_Off"
layout="topleft"
- left="-230"
- name="copy_slurl"
- tool_tip="Copies current location as SLurl to be used on the web."
- top="542"
- width="222">
- <button.commit_callback
- function="WMap.CopySLURL" />
- </button>
+ left="20"
+ mouse_opaque="true"
+ name="zoom_icon"
+ top_pad="7"
+ width="16" />
<slider
- follows="right|bottom"
+ follows="left|bottom"
height="16"
increment="0.2"
- initial_value="48.5029"
- label="Zoom"
+ initial_value="-2"
+ left_pad="0"
layout="topleft"
- left_delta="0"
max_val="0"
min_val="-8"
name="zoom slider"
show_text="false"
- top_pad="8"
- width="222" />
+ width="200" />
+ </panel>
</floater>
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 bffd84877f7..00000000000
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="360"
- label="Region"
- layout="topleft"
- left="0"
- name="General"
- top="360"
- width="280">
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left="10"
- name="region_text_lbl"
- top="10"
- width="100">
- Region:
- </text>
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left_delta="50"
- name="region_text"
- top_delta="0"
- width="200">
- unknown
- </text>
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left="10"
- name="version_channel_text_lbl"
- top="30"
- width="100">
- Version:
- </text>
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left_delta="50"
- name="version_channel_text"
- top_delta="0"
- width="200">
- unknown
- </text>
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left="10"
- name="region_type_lbl"
- top="50"
- width="100">
- Type:
- </text>
- <text
- follows="left|top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left_delta="50"
- name="region_type"
- top_delta="0"
- width="200">
- unknown
- </text>
- <check_box
- height="20"
- label="Block Terraform"
- layout="topleft"
- left="10"
- name="block_terraform_check"
- top="70"
- width="80" />
- <check_box
- height="20"
- label="Block Fly"
- layout="topleft"
- left="10"
- name="block_fly_check"
- top="90"
- width="80" />
- <check_box
- height="20"
- label="Allow Damage"
- layout="topleft"
- left="10"
- name="allow_damage_check"
- top="110"
- width="80" />
- <check_box
- height="20"
- label="Restrict Pushing"
- layout="topleft"
- left="10"
- name="restrict_pushobject"
- top="130"
- width="80" />
- <check_box
- height="20"
- label="Allow Land Resell"
- layout="topleft"
- left="10"
- name="allow_land_resell_check"
- top="160"
- width="80" />
- <check_box
- height="20"
- label="Allow Land Join/Divide"
- layout="topleft"
- left="10"
- name="allow_parcel_changes_check"
- top="180"
- width="80" />
- <check_box
- height="20"
- label="Block Land Show in Search"
- layout="topleft"
- left="10"
- name="block_parcel_search_check"
- tool_tip="Let people see this region and its parcels in search results"
- top="200"
- width="80" />
- <spinner
- follows="left|top"
- height="20"
- increment="1"
- label="Agent Limit"
- label_width="97"
- layout="topleft"
- left="10"
- max_val="100"
- min_val="1"
- name="agent_limit_spin"
- top="240"
- width="170" />
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="Object Bonus"
- label_width="97"
- layout="topleft"
- left="10"
- max_val="10"
- min_val="1"
- name="object_bonus_spin"
- top="260"
- width="170" />
- <text
- follows="left|top"
- height="20"
- label="Maturity"
- layout="topleft"
- left="10"
- name="access_text"
- top="290"
- width="100">
- Rating:
- </text>
- <combo_box
- height="20"
- label="Mature"
- layout="topleft"
- left_delta="100"
- name="access_combo"
- top_delta="0"
- width="85">
- <combo_box.item
- label="Adult"
- name="Adult"
- value="42" />
- <combo_box.item
- label="Mature"
- name="Mature"
- value="21" />
- <combo_box.item
- label="PG"
- name="PG"
- value="13" />
- </combo_box>
- <button
- enabled="false"
- follows="left|top"
- height="20"
- label="Apply"
- layout="topleft"
- left="108"
- name="apply_btn"
- top="320"
- width="100"/>
- <button
- follows="left|top"
- height="20"
- label="Teleport Home One User..."
- layout="topleft"
- left="10"
- name="kick_btn"
- top_pad="10"
- width="250" />
- <button
- follows="left|top"
- height="20"
- label="Teleport Home All Users..."
- layout="topleft"
- left_delta="0"
- name="kick_all_btn"
- top_pad="3"
- width="250" />
- <button
- follows="left|top"
- height="20"
- label="Send Message To Region..."
- layout="topleft"
- left_delta="0"
- name="im_btn"
- top_pad="20"
- width="200" />
- <button
- follows="left|top"
- height="20"
- label="Manage Telehub..."
- layout="topleft"
- left_delta="0"
- name="manage_telehub_btn"
- top_pad="20"
- width="150" >
- <button.commit_callback
- function="RegionInfo.ManageTelehub" />
- </button>
-</panel>
--
GitLab