From 52a517847921f52655b79e30ee79ce2128637983 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 17 Apr 2018 16:02:52 -0700 Subject: [PATCH 1/2] MAINT-8374: Added inventory icons. --- .../skins/default/textures/icons/Inv_Settings.png | Bin 0 -> 925 bytes .../default/textures/icons/Inv_SettingsDay.png | Bin 0 -> 925 bytes .../default/textures/icons/Inv_SettingsSky.png | Bin 0 -> 883 bytes .../default/textures/icons/Inv_SettingsWater.png | Bin 0 -> 764 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_Settings.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_SettingsDay.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_SettingsSky.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_SettingsWater.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Settings.png b/indra/newview/skins/default/textures/icons/Inv_Settings.png new file mode 100644 index 0000000000000000000000000000000000000000..c43ba349c486e32db0ff2ec222c665a72b0d0674 GIT binary patch literal 925 zcmV;O17iG%P){0OnIuy|=$p+QY-l#zy-q%q2`&6_vB z)ckn8Hsi3R1Rx+)<(YO^?b|e&4^XE*i59sHhPhHcTrg zJT4qu$(f3`gD01OJde6beJnFGExtoWJ2oK#_|cePj8S~_F(lSU5B>DYj56`weEcL?i8aKUtYWc5 zf+RV*MO~KcG4XNHW71Qss`~$}s~sQcFJ!OxL)DYxymdnL7JP3y&gY@yd>?`P5iT;N z`0N1;zKgzD(meanxDIERB`vZ8=Nr)WVCt5hm)tU3@i@GmK*JogTtn?bp=QN(j_)D7 zCQo$*yL<9gWPju04-GVDy>nq^#{d8T32;bRa{vGi!~g&e!~vBn4jTXf0m4Z{K~y-6 zrIJlZR8bg)pL@^fFs)2%%E3qov{JG`F&83(p|%Lb7IuUd8HkHCkjRCB3?d2=4rU-U zV4L8cVnhlN#<<%EgG6SUgf>Fiom}J~NmSgKHYwBfZ=!eio$tI44~GN)87+HIN`(RM zK6lrplwJD*lu~zrGQcaPTy%hIQ>oO?WHR|R7z}p*1yD*o1d0Jyj@CBtSxVUhp#NhT zK-jij0<>%ccFIom>}2nR5E@Xu4ahl$VfYQh@c$V#$U!|8iyezbqo;J2XsC*e6od-v zzFU@c9(a4GK|CHW`qFf^*3(?=>spKy=t9t8KK8g9FO*)N4-WwD0}V{mJmJko;~&Z zBcmq)$Ygll(8-UDO^y^7apmPB0MfRN4p`}Q+I9ju+OI8zj$YhKF0X*5QQp~#$6HAG zjaC3Yy{0OnIuy|=$p+QY-l#zy-q%q2`&6_vB z)ckn8Hsi3R1Rx+)<(YO^?b|e&4^XE*i59sHhPhHcTrg zJT4qu$(f3`gD01OJde6beJnFGExtoWJ2oK#_|cePj8S~_F(lSU5B>DYj56`weEcL?i8aKUtYWc5 zf+RV*MO~KcG4XNHW71Qss`~$}s~sQcFJ!OxL)DYxymdnL7JP3y&gY@yd>?`P5iT;N z`0N1;zKgzD(meanxDIERB`vZ8=Nr)WVCt5hm)tU3@i@GmK*JogTtn?bp=QN(j_)D7 zCQo$*yL<9gWPju04-GVDy>nq^#{d8T32;bRa{vGi!~g&e!~vBn4jTXf0m4Z{K~y-6 z#ge~k6hRb#zxQSqgF6A;y=_!3XcAFOX=5W25sy@MmV&8MX(yPou(PqTO6=2F`d9cT z1U;0%lKbi1u6V+;m|G3pACL#b3~y$>;eGSqyhGg64@NbDdWckGsK>}`0KaGd4(;td z-|^)C?UtvI0!iwS`b=TDB$8H z5Tz{p?Cd;1M3w-KhcCLK4n#ndxK;$fc@SmNKc(~dK5J`NDa!%#`5!hnuQQ!iIO)9V zA{yz=gBcA_L_wAEbj0_s-?(%82HV^BSYK~*eB9&Yq(pdMo77{dhER`?Y6$fNnf0Nb zKs7+B5mci%pOFjTNmelDdy_2BHxV+?4J{Hzv}Y*LM%jKyqk)C|&%_YJr6!f?b0D`Dm5FJmdMbj~s68 zBA*Sy6mcF?4^3~Vi#c(KdJr&mcz`S!aJaS0lP{lQVHX0XjTaX$i(B|n%te5xj}Dr6 zck3nA5%xFUK(Z1WEEKW!roqw-(j1yH&OQDD7NC~4P%M1K00000NkvXXu0mjfx=gEj literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png b/indra/newview/skins/default/textures/icons/Inv_SettingsSky.png new file mode 100644 index 0000000000000000000000000000000000000000..77858b23c312ab5aae88888672a34d967ffbb62c GIT binary patch literal 883 zcmV-(1C0EMP){0OnIuy|=$p+QY-l#zy-q%q2`&6_vB z)ckn8Hsi3R1Rx+)<(YO^?b|e&4^XE*i59sHhPhHcTrg zJT4qu$(f3`gD01OJde6beJnFGExtoWJ2oK#_|cePj8S~_F(lSU5B>DYj56`weEcL?i8aKUtYWc5 zf+RV*MO~KcG4XNHW71Qss`~$}s~sQcFJ!OxL)DYxymdnL7JP3y&gY@yd>?`P5iT;N z`0N1;zKgzD(meanxDIERB`vZ8=Nr)WVCt5hm)tU3@i@GmK*JogTtn?bp=QN(j_)D7 zCQo$*yL<9gWPju04-GVDy>nq^#{d8T32;bRa{vGi!~g&e!~vBn4jTXf0hmcdK~y-6 z)soGM6HyR_zq(boyVL1RCJl}<4w48mh~UD_z`VdLd=T+Pd?nqw^$Ao&QNf>y=_Z*l zll0$p(UEcEP7n_ibrw~eqRxT;9>UWXAx;v47*!WQJ*a_t4n_(0Z>78~8;-^?@0LPY z0TzKXaEj&mm?vissoIX$UoQ}Gy!yD}eBDqs{ZKYg(j;PLN;%(&I0f}sgU8firaYSF zfG|7Qo#!Nk!qZT8LgqtaRyX>E6_=L_W z%UYl_5CwIh3Kp@(*rMc_^8E^qGMJ9w{0h1N4vWCYUPt! literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png b/indra/newview/skins/default/textures/icons/Inv_SettingsWater.png new file mode 100644 index 0000000000000000000000000000000000000000..46fb58c3f24add810048393a5abb95eed712ee15 GIT binary patch literal 764 zcmV{0OnIuy|=$p+QY-l#zy-q%q2`&6_vB z)ckn8Hsi3R1Rx+)<(YO^?b|e&4^XE*i59sHhPhHcTrg zJT4qu$(f3`gD01OJde6beJnFGExtoWJ2oK#_|cePj8S~_F(lSU5B>DYj56`weEcL?i8aKUtYWc5 zf+RV*MO~KcG4XNHW71Qss`~$}s~sQcFJ!OxL)DYxymdnL7JP3y&gY@yd>?`P5iT;N z`0N1;zKgzD(meanxDIERB`vZ8=Nr)WVCt5hm)tU3@i@GmK*JogTtn?bp=QN(j_)D7 zCQo$*yL<9gWPju04-GVDy>nq^#{d8T32;bRa{vGi!~g&e!~vBn4jTXf0U=35K~y-6 z#geZ}Ls1xppR-K`LFaIC(L0b~P=*>TcC8jQ8pMA<5NwKJSj6OyAZQeeE}D#M3nGRi zh_JGxLD04<_qANc-Q{|)h+jG9JiOm?z5@sTw5(P+*S;%a9L)p36W4eYD6?r=X|aq$ zz6bcU$q{h-Qz%_vH4SWa&Tq_etc~9ZtbE`G$ae8pE;!V(TVOQ?)Pczk8;sU3GQ3mc zNQ1bLJ$s2Bl_ zW*dgGaOFdf0SZ8WtYef1*Avb@LRe`*AUN?NT8d3mqKdPus#pmtO}$9ov&5amrNpCl ulkxPgY_$Mv19LzK+ye(xOx=C^f7CY)+fx87^wLiN0000 Date: Wed, 18 Apr 2018 09:40:16 -0700 Subject: [PATCH 2/2] Correct EOL for last line of files. --- indra/llrender/llgltexture.cpp | 2 +- indra/llrender/lltexture.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index c0e5477cea..e9a39d8acb 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -408,4 +408,4 @@ void LLGLTexture::setTexelsPerImage() static LLUUID sStubUUID; -const LLUUID& LLGLTexture::getID() const { return sStubUUID; } \ No newline at end of file +const LLUUID& LLGLTexture::getID() const { return sStubUUID; } diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp index 787a09a159..6eef36216c 100644 --- a/indra/llrender/lltexture.cpp +++ b/indra/llrender/lltexture.cpp @@ -40,4 +40,4 @@ S32 LLTexture::getWidth(S32 discard_level) const { llassert(false); return 0; } S32 LLTexture::getHeight(S32 discard_level) const { llassert(false); return 0; } bool LLTexture::isActiveFetching() { llassert(false); return false; } LLImageGL* LLTexture::getGLTexture() const { llassert(false); return nullptr; } -void LLTexture::updateBindStatsForTester() { } \ No newline at end of file +void LLTexture::updateBindStatsForTester() { }