From 55343314e1b76f5072a4c4716e75afea244ac310 Mon Sep 17 00:00:00 2001 From: Beeks Date: Tue, 26 Oct 2010 23:04:04 -0400 Subject: [PATCH] ffffffffffub Signed-off-by: Beeks --- indra/newview/ascentuploadbrowser.cpp | 8 ++++++-- .../skins/default/xui/en-us/floater_about.xml | 2 +- .../skins/default/xui/en-us/panel_friends.xml | 15 +++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/indra/newview/ascentuploadbrowser.cpp b/indra/newview/ascentuploadbrowser.cpp index e0b3b3db1..aaa7638fe 100644 --- a/indra/newview/ascentuploadbrowser.cpp +++ b/indra/newview/ascentuploadbrowser.cpp @@ -36,12 +36,14 @@ ASFloaterUploadBrowser* ASFloaterUploadBrowser::sInstance = NULL; ///---------------------------------------------------------------------------- -/// Class LLFloaterAbout +/// Class ASFloaterUploadBrowser ///---------------------------------------------------------------------------- // Default constructor ASFloaterUploadBrowser::ASFloaterUploadBrowser() -: LLFloater(std::string("floater_upload_browser"), std::string("FloaterUploadRect"), LLStringUtil::null) +: LLFloater(std::string("floater_upload_browser"), + std::string("FloaterUploadRect"), + LLStringUtil::null) { LLUICtrlFactory::getInstance()->buildFloater(this, "floater_upload_browser.xml"); @@ -185,6 +187,8 @@ void ASFloaterUploadBrowser::refreshUploadOptions() llinfos << "Selected multiple files." << llendl; name = "(Multiple)"; show_multiple = true; + /*LLButton* expand_button = getChild("expand_collapse_btn"); + expand_button->setLabelArg("[COST]", std::string(mFileList->getAllSelected().size() * 10));*/ childSetValue("multiple_uploads_label", "Multiple files selected. Total cost is: " + llformat("%d", mFileList->getAllSelected().size() * 10)); } else diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 225af6615..f67db5d00 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -7,7 +7,7 @@ follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6" max_length="65536" mouse_opaque="true" name="credits_editor" width="458" word_wrap="true"> - Ascent is developed and maintained by Hg Beeks and Charley Levenque, with code contributions from: Hazim Gazov, Zwagoth Klaar, and viewers like you. Ascent is based off the Inertia source base. + Ascent is developed and maintained by Hg Beeks and Charley Levenque, with code contributions from Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and viewers like you. Ascent is based off the Inertia source base. Ascent includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml index aba8bf589..6d6638bb1 100644 --- a/indra/newview/skins/default/xui/en-us/panel_friends.xml +++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml @@ -25,27 +25,30 @@ tool_tip="You can edit this friend's objects" width="20" /> - Contact Group: - Contact Search: +