From 3e11f81b693cf17e767d8890a5d02ae2c152d20f Mon Sep 17 00:00:00 2001 From: Tofu Linden <tofu.linden@lindenlab.com> Date: Wed, 31 Mar 2010 15:24:10 +0100 Subject: [PATCH] EXT-2418 - improved cursors for sit/open/buy - the neglected Linux part. --- indra/llwindow/llwindowsdl.cpp | 3 +++ indra/newview/res-sdl/toolbuy.BMP | Bin 0 -> 3126 bytes indra/newview/res-sdl/toolopen.BMP | Bin 0 -> 3126 bytes indra/newview/res-sdl/toolsit.BMP | Bin 0 -> 3126 bytes 4 files changed, 3 insertions(+) create mode 100644 indra/newview/res-sdl/toolbuy.BMP create mode 100644 indra/newview/res-sdl/toolopen.BMP create mode 100644 indra/newview/res-sdl/toolsit.BMP diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 4d25b4134ec..399d284402a 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2074,6 +2074,9 @@ void LLWindowSDL::initCursors() mSDLCursors[UI_CURSOR_TOOLPAUSE] = makeSDLCursorFromBMP("toolpause.BMP",0,0); mSDLCursors[UI_CURSOR_TOOLMEDIAOPEN] = makeSDLCursorFromBMP("toolmediaopen.BMP",0,0); mSDLCursors[UI_CURSOR_PIPETTE] = makeSDLCursorFromBMP("lltoolpipette.BMP",2,28); + mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",20,15); if (getenv("LL_ATI_MOUSE_CURSOR_BUG") != NULL) { llinfos << "Disabling cursor updating due to LL_ATI_MOUSE_CURSOR_BUG" << llendl; diff --git a/indra/newview/res-sdl/toolbuy.BMP b/indra/newview/res-sdl/toolbuy.BMP new file mode 100644 index 0000000000000000000000000000000000000000..07e927372182c096659347c786dcd83f86dbfa85 GIT binary patch literal 3126 zcmd6pJ4jnm7=V+Y7)*TyAMsV+HX`v=4Hd1Ah;J*1pdum^goG>(ZsI12gG+G}+#IBX zjt(xxXD4;&6r#Is3Z3m|{^oFd@6ByM3;iJ{|2^m2?|+_?1U~uS*ka;m^zteH{ju9T zXb9_WmwaTxX8ZmhOWeoj?|<QDOG}H^gy^qj2-?)t)VH{Njmi4@`m4kO1m|HtK0ZFh z1O<6`cz8Kq2VY)ZhOEY&ot+n&(0YD(dC8-0Op;%&k+QO~l9H0VygY})LE3Rx(xM|{ z>&Mg6>guYsiK?oq#>U3Fy1L5B%C|AWRCRTAK|uk8NF)MWMk627)FlxgAmrlW;_U2f zMwstnf>Kmeq~JISL9Ea?FxAK;MosxOH8nsW*VfjywzjslwY`rEWK=T4>*5|W=%!-I zhgn!yNFKD<IR5z?U~_XbCfHe8S}J@zr{|>{D8w}~GQ!BJ?x1-*9@6gj`?XA+&RYmp znwpwWa9)5UN0G@4CUo%p{CqsOhAUg}8yXrEA0RqGfi;rFP-bRkqO>TiC@U)~KA%s= zH?5`$!R>ZSK_QHej&5yjefd)c1_tnXW@d(^o12@>&CSKdMXmn|Wvb-l<R~W>78ZUQ zWOjD;^z@YJy}i9?G`hXLeS3RLDkv*yw{{+jw2exR@UO0}=H});$ECBgb9#E3&LN7k zvop@!+S=OP-5n-?bFNL@R+AMK6?D6VApGOwV<0LhtpdNVukZT$8t2Ex#%LtE&Th9W znohw1lCKCB{O<1Vjg1Z5CQ)Q56bf<DdC}|jrlzLqu<8+heSLj<d;5o&1cO0dKRG#} zNn}RGrKP3&`+MNX#KZ*oRIBVvNl8&aqr$a7hB1NQmGJ36nUV40;)2dWKR-X$E_HNt z;GT7fxyOiIIEna2M@M)*KR*wDa&mHif1e)|s>X|y&*-yuhW_vB>LLW335UbtKZWB_ z$>8AN!NCD3Vih?&JfxjSQEzW=Zf>rYX4KQt(x3$b0Za@H4Pk=jBpe=%vb(#B+cMwN z(?iF)TrMM1H^cqIAtl(4Nei0^inF6bnLg40RBd>8n77E)UxjT%$`wKEra<FlMn(qt z<VccIUbhf7;0dM4%E~fwEM_o4V{<C|`}={AUZb$Y2CBoAYk^9%M56esK&{8e$GJ-> y3OWLoM<%%(_@!_<orws^%%`WPV}<n6C*+xIpwKq7Ix!|gNPZ7z)B1Q?qkaK?rjTd= literal 0 HcmV?d00001 diff --git a/indra/newview/res-sdl/toolopen.BMP b/indra/newview/res-sdl/toolopen.BMP new file mode 100644 index 0000000000000000000000000000000000000000..5b87979304979a70dd091f04df1977261bd3ef5a GIT binary patch literal 3126 zcmd6pIZs<b5P)q20@>lRY%o{2jALYR2CQ&|!<fTBT>5X&(?gFe@dN1K7f_~51C@mY z1(ju_(Aj_p6y(DbuQvN04<bOyNZvO)yZg=T?Ce7PTkM0YBr)0uzpg(&w=0N-Fz)lp zPYf>CkN;T8F+P6ZBh1m!QQd{;Z{-MDI-UMrmV<+X{r&yj-Q73Y3lM^bT__YDN`fNt zdcFbQ+}wn$+P%HKSGv$6KR!ODtG7o-M=#`eY0}x*+1}nB2m~rBDo8s4OImcY=-G#d zjg1Xw7rni`LqkLT{rx>XJs(Sgt57J^+}upGXJ==?rM2>LeRz2I6dxeuwzjs0h6Y-g zpGtz#+S;n%1PMXBP&qJFixH=`{Jy?EAdti1@YvYc`1ttevOq>9Gc2cUSdInVR&4n& zTUuJkgN`lZAHM)cMn-VK%#Mx@;S>4x_O=`c3j11JU8QBzxM;y(khI5QF`a4XtU~ZI zJUom-@B$<`ip<t<VZfW3nuy#Pu6)5C92``9$rYOdYbA@Ly1F`*7Tc6!guk`5MGM*B z<H877@A`Z`IZ%nvfq!yxlF4M?Q)7DkI?bv#Ha4ogqd4$SPfv@5;?B+vDIygdD`|HQ z9(R<DN{%x>o6X+d-d_H^BzSQFoO^AJS+{g|cT??Z3%~3{@(=&|`WhEZ#)Sw~=XSew zpso`D$yada_{l$fM4umtM5?N)bf&Juk4B>t6BA!vAm``jcXxL;H#hp+fq{X_%1WJS z=sXM4)6=+kiRANnT&S5-Q&WWJe8jwCv$L~m3CiT;q;yp+>7%$%T^4eDM!-gw`k$GZ zVG9Ifh~gV|)t#T8_xt?@(CAiISM#34<8fSwBoYZx6u&(3*LQAijw<zfy#~<Q<^5S& zT4J+bOTt1$R?5Z2g^Wte<mKgM?v9mawNL;&DamA#Rpe@MagkP$QSR^Wu_$5M%E}7$ z&)%&xTT5+iEmg;@C#5VGxw^UnUMv>NhQ}`xh=e1kudla7J!QlN55@ZWI`IP`OGqx4 z6Gd8vm_YsT<UYl5u#+hMRp6{ssnpuq8i#_8fTfFZVPS#46g4$94v=SuJRT2TNH66= Zp2-FZZxp4@9-m$QPZPMC&ezkK_8Ve&==A^q literal 0 HcmV?d00001 diff --git a/indra/newview/res-sdl/toolsit.BMP b/indra/newview/res-sdl/toolsit.BMP new file mode 100644 index 0000000000000000000000000000000000000000..8ce59ae97a9bbb6a2485265fcb02aa8a8ad653d8 GIT binary patch literal 3126 zcmd6p%}!cT5XZqtAW~6?B8pZ)r5K{16;cBQgaG2#(ueT@T=^WD@DQfUu3UBHGq`d| zwDu>bOeXhSZb-CAC%K3JJ!kH3=FIuf##!l;Z(t?bEYI5C$L~v^FveqH^Oz2w@8^GP z!yMm!|3#X6dwV*B(H|8E+Qr4ikD>K?z1!Q{>+9<enF|n-hyC>Q^g1vE_W1bte!c^K zd3gz0+MAo3cZSfJ-{0T!>S)L0uPIwyU0q&Yo}Zten3$mKBy7s!AQS7?>+99km3N5s z_4Rx{zqPfMPNzQ)j8GdJ8w(2y5FQ>LfScCl6Pk4y#RmvEnM}^k&eFpCGBCu_(vrYQ z5`u}s&VeZ{odk8|Z*Fb^ft<-?_V@RT#p2hYK}J#;J~!#ngLXAnKFr0%Me3ljL;Tw> zz}?+lLg2ZwvSRpTPPNT)Aeh(j@i8r<j)Rs+Bq)2SRMJfJ-QAt^@D)asLZN^lc>|<4 zLZ&i=aKPj7IGGDvGl2--goD4cvm<<fXeI^LCYwN!NJN)KGqr}#D>Mh+bv0!Qu~^J3 zsN|`cS__{&rt=q+tB6LULN-D(wH7`lq7*DEW%o{=h-@2O90QSvHlHDqHz9y?u3giX z&QvPJZWo~8gLT-;%kO@_Pp9!DgfVuV-|rWiLy!Q)*YHt%3FmOmX0w4nz=4%l__<u} z;Nak!GJ_)9=jUg^icpSka(jDwa&l6Dw%}T*R4RmUHNlF|Zsl^B^t_jtd#qNg>94dF ztOz~Ihb*6+v+iO4SF2T~Kr*%oR)qFBJUpD6o6|H~2ZKTGlSZRK2-^fJLVW7=I=eI+ z4%<ve5BE>I-Da}iEfcH=<AQUi)8XtmP_D0R0Irm7x64=5N}FIsFpAsJ(GmNfxw``G z>oCHXEm&lJdES;Xo#=!pzK!&GG0V1Q*5W>1nIg0z!FhV+aSf5Ld1TYSa*g;$H>U z`uzO-<m7}!L1SQfrL);=@|PkM3XLL+(?2yeMHI@*R-w*R1Hm1|R%edm5XSf6Y<eG0 GZ`2>IRMOG_ literal 0 HcmV?d00001 -- GitLab