From ca757ff1b2df1412c5d377dc77961b3c6c928306 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sat, 15 Oct 2011 03:10:31 +0200 Subject: [PATCH] Spit shine on browser, good as new! Thanks McCabe! --- indra/newview/llfloatermediabrowser.cpp | 10 +----- indra/newview/llfloatermediabrowser.h | 1 - .../skins/default/textures/go-home-4.png | Bin 0 -> 485 bytes .../skins/default/textures/go-next-4.png | Bin 0 -> 508 bytes .../skins/default/textures/go-previous-4.png | Bin 0 -> 467 bytes .../skins/default/textures/textures.xml | 5 +++ .../skins/default/textures/view-refresh-5.png | Bin 0 -> 786 bytes .../xui/en-us/floater_media_browser.xml | 32 ++++++++++-------- 8 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 indra/newview/skins/default/textures/go-home-4.png create mode 100644 indra/newview/skins/default/textures/go-next-4.png create mode 100644 indra/newview/skins/default/textures/go-previous-4.png create mode 100644 indra/newview/skins/default/textures/view-refresh-5.png diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp index d73cfde72..43abcb8c0 100644 --- a/indra/newview/llfloatermediabrowser.cpp +++ b/indra/newview/llfloatermediabrowser.cpp @@ -105,6 +105,7 @@ void LLFloaterMediaBrowser::draw() media_playing = media_plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING; } } + childSetVisible("time_controls", show_time_controls); childSetVisible("rewind", show_time_controls); childSetVisible("play", show_time_controls && ! media_playing); childSetVisible("pause", show_time_controls && media_playing); @@ -139,7 +140,6 @@ BOOL LLFloaterMediaBrowser::postBuild() childSetAction("pause", onClickPlay, this); childSetAction("seek", onClickSeek, this); childSetAction("go", onClickGo, this); - childSetAction("close", onClickClose, this); childSetAction("open_browser", onClickOpenWebBrowser, this); childSetAction("assign", onClickAssign, this); @@ -284,14 +284,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data) self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString()); } -//static -void LLFloaterMediaBrowser::onClickClose(void* user_data) -{ - LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data; - - self->close(); -} - //static void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data) { diff --git a/indra/newview/llfloatermediabrowser.h b/indra/newview/llfloatermediabrowser.h index afdd6e733..c2203670a 100644 --- a/indra/newview/llfloatermediabrowser.h +++ b/indra/newview/llfloatermediabrowser.h @@ -85,7 +85,6 @@ public: static void onClickBack(void* user_data); static void onClickForward(void* user_data); static void onClickGo(void* user_data); - static void onClickClose(void* user_data); static void onClickOpenWebBrowser(void* user_data); static void onClickAssign(void* user_data); static void onClickRewind(void* user_data); diff --git a/indra/newview/skins/default/textures/go-home-4.png b/indra/newview/skins/default/textures/go-home-4.png new file mode 100644 index 0000000000000000000000000000000000000000..058c00af4f9a23c2207d353e166ad4fdf6d08870 GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLGcpTh?3y^(xT*426sPyUsnas z5NK7Ot+R=Hr_;L$$xl>nK4FVfSkCcdzd$(SW)UGKuBIIVtcnY`k9M4!k>Rn_YngP* z%Q7jstdIAuU%k5HHs`cO8se)~*)3XkVo~NT)5#i}SIu7bGv&6~f_ofIi5qmXmpoTH zV9>*U{xe^Lw(sS9o;rmIc8S6b538@2PB(~VS@=MW!MFUzr+KW;E1ylUIscTw=DF^+ zUtin1=Ug@^l=YT*U~%qg7T=9;yz@S8UiUh_i1#oli=}^OvK?6#6DoSbWp={x)42O{0ITlgQWyUHmp(DCkg9HI4zgE4ZNqeNTKM0bvkMI7fQ3KY!InZ4o5&Y#Y6vwyJj Y?lpaEc<1SKU=TBSy85}Sb4q9e0OCZ#*8l(j literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/go-next-4.png b/indra/newview/skins/default/textures/go-next-4.png new file mode 100644 index 0000000000000000000000000000000000000000..b4362c1ed5b55644ae056f7fafc10c307f13f836 GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLGcpTh?3y^(xT*426sPyUsnasE6vBJ^AN;62r^qaGWr~iFrr6V^w zMC0D=o%7l5`Ak?#r5aqhX40oN_2``b#r8zhayq-fK26`?Q=j(;O8=B$Vbq=O-Sv2e zSocw}2@*fes|DCpJe}q}pZI#$+(!{2t}?$FTeSD(EAVg}o{+X#(s%h~zlE%Mi&u4o zSJ*A=<~r2ywaRzby2;Bj>$_GL$h50?CVhS!$GY$R<*cn%7i#R*H{6kW|N4{sE#n9C zw&kAOwC6G7r?nZq)%p{PuYcuAX7RHQxwXx=E%8l)pWuGkFUB8p)FyMzzQ19=T*|uk t->k(9pRXnq^In*}{1-ptv(0w*^|dFr{%g2)wh|cf44$rjF6*2UngBd$$eREF literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/go-previous-4.png b/indra/newview/skins/default/textures/go-previous-4.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a677ecd76f219fc5a52e4c9fb5a43c5c1ad73f GIT binary patch literal 467 zcmV;^0WAKBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+-fnQ@s9TarYAc{r=?W9Oi{7O@yB)K_P8k*ougB1?<;(gEa9)0g*a^m4Q z?&VYs^Bl%Ap66e&evSsfG==$1mgNrnZWI89OPDRgFuJyF$tVDduVH?-EbF_fD$+C! zktB&iSXvw;L(v_~x#KviJkLoG1SClkQrC44qU%m&Sso^X`4Q%Y@B5o9%gB5_C)hJZ z&x)e>1;Bg-EfKr#NLMP;G?|*sW+YA1L4s#N5SE_j_1#rfJt|GpNF2w*pNkYv^fPSR z?xRx(-A7S0P#A{n=>YNoNQ?Lznuh*JQ54sBzhdZc3cHb@@E(v-*Y&mQx_u|;oT2H_ z3x?ubKt2>jq20&b#JwapfFuBXjk?PF#Xlp~{tci;Kra3QYyn1Rh5jQMT?GID002ov JPDHLkV1iC-z9|3z literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 3f93a7ef8..c7929b058 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -390,5 +390,10 @@ + + + + + diff --git a/indra/newview/skins/default/textures/view-refresh-5.png b/indra/newview/skins/default/textures/view-refresh-5.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5d1b97c5698f7bf171c39068d48163f06dd5b9 GIT binary patch literal 786 zcmV+t1MU2YP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00009 za7bBm000fv000fv0g!KboB#j-6LdvbbW?A2a${uxM@~;oMJ+>bY;SUNs+mOM0000P zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQI5#_hT>tITlF};FcZ46ZWntQK~ zS5D7)L#MgaTzKw#?|Gl|obx{C-P_YWCX;F3VzGR*+wCo^ve|52+ibR9z*nQu_;gFh z-W%-EE**iJz$b^pvF>)eE7Coq(P$G01TG-_4T*2D(oVo&Fx)@|S2CGg>J#<PhK9r8ltm1S!@3O;4KIBT(YLzCFiQurnU@-XO0hARMsMTsBh$)<7gVLUAGT7N(O`w#NZN~J=DLV=piCY_y~X%PJmV{iSPgf92d<r z@!*OW$j7l*Y|SG1d|n&{&MS!5fCKpP0vG5QlSr4#Z}2H?V$Yzx0W}0sq65%p*>> QssI2007*qoM6N<$g8eyEzyJUM literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml index 3028dc7ae..ec1aa623a 100644 --- a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml @@ -3,18 +3,20 @@ height="440" min_height="140" min_width="467" name="floater_about" rect_control="FloaterMediaRect" title="Media Browser" width="820"> - -