From 7e210d185f9b5bccdeb108e79b97a7a1a44b4374 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 13 Apr 2010 18:07:24 -0700
Subject: [PATCH] fix for EXT-6317 and EXT-2418 regressions in installed
viewers new 32-bit mouse cursors were not getting packaged by installer for
windows builds
reviewed by Monroe
---
indra/llwindow/llwindowwin32.cpp | 6 +++---
indra/newview/res/toolbuy.cur | Bin 4286 -> 0 bytes
indra/newview/res/toolopen.cur | Bin 4286 -> 0 bytes
indra/newview/res/toolsit.cur | Bin 4286 -> 0 bytes
indra/newview/res/viewerRes.rc | 3 ---
5 files changed, 3 insertions(+), 6 deletions(-)
delete mode 100644 indra/newview/res/toolbuy.cur
delete mode 100644 indra/newview/res/toolopen.cur
delete mode 100644 indra/newview/res/toolsit.cur
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 8df9dad5811..13e71ed9366 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1548,9 +1548,9 @@ void LLWindowWin32::initCursors()
// Color cursors
gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "res", "toolbuy.cur");
- mCursor[UI_CURSOR_TOOLSIT] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolsit.cur").c_str());
- mCursor[UI_CURSOR_TOOLBUY] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolbuy.cur").c_str());
- mCursor[UI_CURSOR_TOOLOPEN] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolopen.cur").c_str());
+ mCursor[UI_CURSOR_TOOLSIT] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolsit.cur")).c_str());
+ mCursor[UI_CURSOR_TOOLBUY] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolbuy.cur")).c_str());
+ mCursor[UI_CURSOR_TOOLOPEN] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->findSkinnedFilename("textures", "toolopen.cur")).c_str());
mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
deleted file mode 100644
index 7fd552a78e97ad980e6138a25ec9ede085731112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4286
zcmb`KTTE0(7{|}D;v&ek+%K|Rg%|-r2o#lD0YPg*Y{aUiB_YKSThox#mXMT$YDmfp
zHGQ%2RALDal0H-)Oqz|NBsKvbY9A~Z+SpdGRM><{8|3T%KkRG|E0+a3$?wdZb7trN
z&G&sXbJj3?42xm68%DShZ1jg1Mx<dF832!rQh>L(qS)1S*+oQ*jk0Wj|8A^kZUey}
z0>rq8MjZuS0fB&he1Q+JY*d^5S11-dvjOVXgLlCh@HVIfMIaBv0ooA&lnwubKD9Yk
zC`ixE&82~40XV@B=m8&q96*1B0YBjLlKNVkKDUGSj~zQE4u`|dz`%eL+`Vw&LNDHb
z43Yt369jx;QlBy34&p&G=T2>>(}`i13fhZcW_EV=d-VAdlz|k$obX4l&E_BH&X_aZ
z-|^ILYim<>xavjJPkVcN8H>*Vmj`VQ-lV?vJ64;K>Zv_4G9rBDQ7_{DDf)j0sz4$L
zv)k=hyQ{Jt?~1@%;2h{6iHV7A@$vD^5fKq}K0ZDw=4PLJ=(_FrL1eMBvvV4{*8qJG
zf$@wL*otSbrKF^^XJ==BnwgpTMRIcTS37p>_?qBdUutUV<*2BrLC*8Rg9j?ux?WA6
zHX=WsL-!X@3=&q*4uw_=bi3l>;=Tz92^mNI7<$ik?%XK^?fKZ)*eSC%=BCyi4WS*#
zc@=+i&3Cj7y3as0Nb%4QO-oBVhp`8s`zSp<{hz&i_ey?#zU1ZQxuGuaxz<>i^B7CT
zTs>Ih;?k!N%0Qw?e=GFP#Kgp0!?Qm<HO=~L(}q2J_9z?hJ4r}LaPk=o{fzbQUWaVc
zKee^Bsz$#>XlH^Dt&dojMn^|~i+Zl0pujy>PhImp^$6|A$;olgUu)6#x~=0w8=%Xz
z$Fsod(%%*t8F_{C_Ey_$2lcbEvX<#%Y;{lHP}8Lwj_3OPv7l|Z^oxRmf*!5sbF-#y
zx3{;;?%lgr)W`5|g4aPV;C{z*Lg}Jbh5BJ(VV7a&JadiX9y)YLE?&GSJv}`yP*qi>
z{C)iRan)yhd|bM_yXEZJvoFja0$gL+faf01n`PR#SMv`I4gFEihjmj^lg!P{t;mTJ
zCuC@7NWJUt@0YQ$F}ZZ<l01C)Q2Cg-r(=!b69CWK6}9o4B@H?Mo7wkTe{^(IPMta>
zjg5_N_U+pz_4V~C?-}>ow{HvfCpmxqyi86`>NpGb$0rtx<yDN&?~JudMN(4IjP|{G
z{x@&lRAZZc<JqQuMMZ_&yLV5mx5I}ItF^#&1pPPG5_Y|-XY9@6>iMswUs6&cU0q#j
z&Wsh~aQgIV!M>?-C?g|7e0_aeu<X}7Utz<^UAuNI6crUoVPT=7xw%=z_tvdjD!27>
zUAMNj%GA`9(x%Vr>gv=Uso%5an%J^s%X?nv*I>_`Wn5_k;XF7e>T_M|=eiyq9v0?3
z@9*5X^Fp8E;$p#^<}tT=FZ7dezWhpm>hagpzj5P+ntMY-gVH~G^r&3DdR6$X!93zv
z$f-%_XRW92TK{(s95^8K0c~$-X>re=`zoKAsjjY;!NEZl1HDeKU%#%_1btstRwm)$
z;rE$e-sszGwhy86th~Hj*>LdSL1hEi9(_W)R->=4Pt94sFD)(Q{xlyD5YXwZKKfa)
z|BrKTqwn_b-@hsNTlxn3$s>%(Z$q!<&ln(ATaar{YHDhf4UES|pf>%6^KcseY^64f
zH~yzS2@DMEMEsmQs~AI$=?&~lyOAS*1qTOzzNEZ#-H5)n0ekTu+{Y>_E0rCL>1wbK
z`yx-KafWuAwb|aNK5bwu@Qpi$e4IaW<cK;CnH$VcLQS5Le22aFZ~W$GKR-XW&&@V$
zMxQpI`1<?%e*`=3Bc_wc?`gz$0e*hYHrDxLtnr@^vro`h<r;tFSvIRr8#EX*4e%^G
z2^w5&e!s6<*3-v(SD7ghnMo9xz<(l#O{Bvnzjs*iv1Y{|St~YE>kOE{Tpjpsb>Odi
YhZnG)!?4PPVN=ZDFV}(rDP{)Bzsz1Z-2eap
diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
deleted file mode 100644
index 1562f5bc95517983e4cc60ca02ba599b7c48c180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4286
zcmb`KNlau#7{_1J^fUv*(#XCxJA|+=q1pFc5)%V46PJ^dkWpex93>`_j1UvOAd!pX
z1&s<9GY2P}OdmXrffGXlIs^^E%pgwNY|S#1|9{c1eKbweFjn&Gs#jI7{$G7xEw2^D
zPthr6v!X;Oq00ARiV~$LN;W{1QV-CIUnH~qJ@F%iP%g@e0sec?qj(jBf=CeSBnEjj
zcmV_h_AvlIpu4Cx`+G<_)ENPF`@oyvCU_mR01GGq@ql&&0cpekpiga%WdfPS#l<v`
z90EJ|8H|E=Kp~(%!a)G=dro~-n?5&#w|jegh1F_xF*P-1pPZb$KR!PG71}=lserKw
z0fy()XUwmG1aO0Mr?%a0$FRo<<s)DNzo5^TpaG--u8BbOy6pPn+!=E&_cz?N2L}hG
z9nSm+`O}Gs3C7}6!0kbsLocbX`W?GXNq5(tot+h|bIXrrW@etE|4*P5B!h6X*^Iq=
zCfCqr0k48vV2C6qCl4khB;1IMjC{$@&ril&>vK0<mmPCL91RQ%Y(V!OpbsK3p5lQk
zsB2D3OZ%{(py1=2oSZLGQ&YcAN=o{UpzWLV^z=K?(a}F}o{Ni%GT3T<mOgEqo}PXN
z-9JDTNc5m>f>u9tKZ%czzZ(`7_7M3a=<Q}@WeI|^BQ7rPiB=nPllzW_&<?D78Gmig
zHrfW=UC;*7-1JQu85y@Q_7rqiGBY#xOG`^dSy`DVDJgM5T|RTKF>%dfEE#iI;pNAv
zPaiaZWR3n6=-rHsjlGAuzuh&p`Yh9iqM{;c1KtyfiHUaBG11Q>BO|VT$TI!Y+1V*`
z^gDuf4hU2A5$pPxn3x}tZ<m*syXNYyt9_;(p&f;Vg|7LlTJ*hIR^vk(pv%3-yFl;M
zzZw-4^)2V^tG3n->gVU@pU}tH@|nJ&rc*Zp_3HhjLs@a^TS7uYR<u5sj`Z?F{o&zZ
z=_mTYlRk!j1-uA~0na<$6H*tsOw<n#55EID9b9Ybyu3)uCia`3pBH0eV{)F@FQ?`Y
z0q(H^z<ZDP%?WKh%lVs3rg>FY&3(~dSXdC7_DwN5Ix5!yeay9|#u~#X0^YYCwNcNM
zfi=IX^*wDkFR{<u+?;SY9Af>+x|}=Lfiunm=i|Cgr>n&H{Lb)}no?3yY+B!Q?7h9c
zGofv&{`U5^w1Lm+eqhdh1pSx22|L^R7<<02#h3Xr{?sShcUjKP&K3rPp&#RTy<cI&
z_1xUtLyN^CDk>^2#M07|*x%n5J3Bk4-pk9&6aN1GZ~36#fiw4?>gsAi8!pP~>Z-Is
z`(9O5mB5@Fm|LF@`YE_y{;aF3JEdJ&S?Q|N#zU*cGHuY-aV)H<$I#C|Pv5!!@7LDW
z3i^PydqS)4sa;#w(9j?vA|f7eefgqqG#cN-`MulN*eGqF9i+Lr+4Zc|SKB@1_4V~U
z3mic~LAQO?M?XEz|A(!ut%AO*si~20th3VE+M27M+Mn;XwY3SHCo33}--bTTpE1B%
z?Z+9u-qFz^ZD2fFT3Q5i_jGV@AnVztLhbhUcAfzn@aMbKX2QE(p|(nJaPV#HK|9Yd
z#*kyGY;A2xGd4FjU3F?3`_gW#ft}FM(9e&RkAE+sPdjJ>&f>qiySwH5IX2@!R#sMA
zWwnkzVqdKP4cwuhX|-9ts6K6AEbxu{8`h(vr>94Bb#)1@4X#f@P1doksi|oX@BAJR
z5a9B;)`rXI(*`6%U|`_;u;T$@`WS0{1MxkCpP#Xe`{EJy_^<HSN9Zfp8eeixm(`~Y
zDi|{Z@GiR!UUQcD{eEsbPao~hWUCXxmMp|F{u5b^LJS$j+K?U}YkK^V)#EVL+rTpB
gYQ=Y}6@T4_e1QF|ie4-$Mu`o7xegUbab+O=3u42OY5)KL
diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
deleted file mode 100644
index a1f99cfe6d4b0ee3bb726d6b49b4d5f9acb2c84a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4286
zcmb`KOH5-`7{_m0I%Qy>6nVc|-Vnn35h~AuyphDjK+MF)%1Ov*VoV$*CX$RHCbH4Q
zmE%eShK+IIEJ+uxW)fD83v?1Rs51^YwTXhH^!Wc@?y0wj+fo=$^6z=vbI<QP-*+Cj
znr7E*n$M?cd74}MGDp)2G)-%O(4-ARc#2;npZ**7BZSb-tGEIFt2j`+47s6vsMt^u
z@<Qk-C<|gACuE0g=Vi0MMY5sI1(CY|y$W52UWUdXKhz18LbM|j(rx%3_+)b|4^-FD
z(Ln>L2o#3Cg+7AbfZ8DXBNs}C>`%y-Z2H^>y*@ubFM`2fOdA^;;q~?PJFBa!pW*pC
zP!+`3WJAs;<TK`1pfczh=T3Gw9LBIG3FRmh+S}W^i$0%10jL_{n#e$}i>^P;oiXQf
ze??_4EiLJG7<m-=<F&Ol#^OVW+k-Z{FUXgE$8OVVRQA@^mSCHbM^S%_{+rM^<b`s5
zJ|FgOLS4Z#KlCDW16roMUhh&_S=qJx{QT$acDo*Pv(FW7%#QDbh_0-x?1Ot7q7U*h
zo@Sv-XnUr*y87ML*4FnM8yi2Vs;c_DqM~A*!m}@GYHDs378ZWRd2VlS>%o?JB0g=z
z`ZxynXQ&S<w_tm~S_Jol($dneb8>R-BYyziL4AF_pin+6DJl8g%*NdGeMduR2iCnF
ze{;@fv<=(?XacHM_@3I@+8Y>q1Ki!Zy1JvTt}fBt-7PvhJ7Xf3b?!ALu6c~5$6Rkn
z@?-Gng8<|;@h^dQy|}peHroDBnPxuAw4uGdUAF=6iSqLDFx!~uXT&+S4_T&vrl+U%
z9Q~qTH$pj*k5~^E6%~Dh{I8y#p4eQ?+|A9+xOVa=+R@h57Ms6h(f6_}<3k(3<=*36
z;4t`?3knL>IBzps<#BFidst>4@>^P3;`kU_uhTbV8r(dz%lpTMvS#r8+1c5<s?SxP
zS|^{0KCt3r_!ppOp$>@W9q$R9i(F6S=jP_#f}Mw4Yv%c>Jhg7-W51l5KLFfgtq|`$
z-Zyb<)b;s$Jf82(Tv=9mYTe9d4CrI7JsE2ZUk>rUwPd56sTOPgSJn4&Y-x*C-P|VE
zp%G_+^YM|*W_udr^E)G18m+9X45_}CV{^_{>G(J*j*gD>N76>QADD9=f&Y9mu<>kx
zv6o|*b1SY@oB17CZfIx_PN#Db{gd9Wu;FS`Q&Yt6_lw@%-Z)7X=NXAaWc5_8zQ=lV
zbF)ZGOM5K^{uIvKKl}Up1#L*CQ(&V(eW$OlPhd`mnA<`M{7T#}zYGlxC1sP5D5-po
zg*EjM{Fbx$#{R!EI5;Ti1KOTQiTG;&Kp-IU^78I+eWk*8xm<7I{5}{N8PRQ^9ac)j
zH}@SL9_D#`n3<V*GgUtNIdJ~pA0HnV^xeR~fTa@gWq-aqF)<-<p6p^wejBDVf5rf7
zbrEOyqp7JW-3G=(RU$t7kv%y%$uoE#{(O^crd0e-K9!Y~brX9h%rlHJ<d~_5eQ7t=
z!QXDT`{NVx$?tji(gvKxd$Y5%Vr*<ow}UZFB=%un?16pUp{r&#%jf0O2F3#4xIbb&
z9?s3piJ6%h!L`BlNs-AmJ{uh!{Ri*-l%Ad*^SRlEi|}a!k~1SC<89b+4>5g+HNKDd
zM&RdTmT_M^z#jhrF?$bv^|i*A)O1lkZIHs4wGi*JtI$hEncwecrnC5XZlutV5FxJ+
zJNQo&bP2KS62C1w@UiB=A6W+uQ%4Be!CZs*ZVlqE`*I3mzo6z2JDN*Z2!FXE8c<vr
GNdE!@!h1&m
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 7a965cf57e5..3a20d91129a 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -119,9 +119,6 @@ TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
-TOOLOPEN CURSOR "toolopen.cur"
-TOOLSIT CURSOR "toolsit.cur"
-TOOLBUY CURSOR "toolbuy.cur"
/////////////////////////////////////////////////////////////////////////////
//
--
GitLab