diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:55:00 -0800 |
| commit | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (patch) | |
| tree | 805e57d9bc12d869e87994380d5b023137fef48f /indra/newview/skins/default/xui/en | |
| parent | af2cbcee129911cb4e1d25fbd710d755c13b0282 (diff) | |
Backed out changeset d5b761982e63
This got pushed too early - sorry. Sigh.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
56 files changed, 520 insertions, 571 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 9806f45bc4..82ed1a7d7f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -112,7 +112,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number word_wrap="true"> Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others. -Thank you to the following Residents for helping to ensure that this is the best version yet: (in progress) +Thank you to the following residents for helping to ensure that this is the best version yet: (in progress) diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 900f4c5956..33fdd923ad 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1036,7 +1036,7 @@ Leyla Linden </text> name="Autoreturn" top="164" width="294"> - Autoreturn other Residents' objects (minutes, 0 for off): + Autoreturn other residents' objects (minutes, 0 for off): </text> <line_editor border_style="line" @@ -1175,7 +1175,7 @@ Only large parcels can be listed in search. name="allow_label" top="10" width="278"> - Allow other Residents to: + Allow other residents to: </text> <check_box height="16" @@ -1917,7 +1917,7 @@ Only large parcels can be listed in search. layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified Residents." + tool_tip="Ban unidentified residents." top_pad="4" width="278" /> <check_box @@ -1927,7 +1927,7 @@ Only large parcels can be listed in search. layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." + tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="4" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index d202bf1b9f..86229c6691 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -107,7 +107,7 @@ height="16" layout="topleft" top_delta="0" - left="217" + left="242" name="currency_label" width="15"> L$ @@ -123,7 +123,7 @@ label="L$" left_pad="3" name="currency_amt" - width="85"> + width="60"> 1234 </line_editor> <text diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index ddc0d9af72..0dc7d62b19 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -260,9 +260,10 @@ left="10" name="not worn instructions" top="31" - word_wrap="true" width="373"> - Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new shape by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -273,7 +274,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -300,7 +300,7 @@ left="10" name="Create New" top="104" - width="160" /> + width="140" /> <button follows="right|bottom" height="23" @@ -463,9 +463,10 @@ left="10" name="not worn instructions" top="31" - word_wrap="true" width="373"> - Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new skin by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -476,7 +477,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -542,7 +542,7 @@ left_delta="0" name="Create New" top_delta="-249" - width="160" /> + width="120" /> <button follows="right|bottom" height="23" @@ -713,9 +713,10 @@ left="10" name="not worn instructions" top="31" - word_wrap="true" width="373"> - Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new hair by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -726,7 +727,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -765,7 +765,7 @@ left_delta="0" name="Create New" top_delta="-89" - width="160" /> + width="120" /> <button follows="right|bottom" height="23" @@ -898,9 +898,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new eyes by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -911,7 +912,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -950,7 +950,7 @@ left_delta="0" name="Create New" top_delta="39" - width="160" /> + width="120" /> <button follows="right|bottom" height="23" @@ -1056,7 +1056,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -1170,9 +1170,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new shirt by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -1183,7 +1184,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -1262,7 +1262,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -1376,9 +1376,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new pants by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -1389,7 +1390,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -1509,9 +1509,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new shoes by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -1522,7 +1523,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -1572,7 +1572,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -1715,9 +1715,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new socks by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -1728,7 +1729,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -1778,7 +1778,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -1921,9 +1921,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new jacket by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -1934,7 +1935,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -1996,7 +1996,7 @@ left_delta="0" name="Create New" top_delta="-121" - width="160" /> + width="140" /> <button follows="left|top" height="23" @@ -2139,9 +2139,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new gloves by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -2152,7 +2153,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -2202,7 +2202,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="130" /> <button follows="left|top" height="23" @@ -2345,9 +2345,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new undershirt by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -2358,7 +2359,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -2551,9 +2551,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new underpants by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -2564,7 +2565,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -2757,9 +2757,10 @@ left_delta="0" name="not worn instructions" top_pad="8" - word_wrap="true" width="373"> - Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new skirt by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -2770,7 +2771,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -2820,7 +2820,7 @@ left_delta="0" name="Create New" top_delta="-41" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -2962,10 +2962,11 @@ layout="topleft" left_delta="-2" name="not worn instructions" - top_pad="8" - word_wrap="true" + top_delta="2" width="373"> - Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new alpha mask by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -2976,7 +2977,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -3108,7 +3108,7 @@ left="8" name="Create New" top="104" - width="160" /> + width="120" /> <button follows="left|top" height="23" @@ -3250,10 +3250,11 @@ layout="topleft" left_delta="-2" name="not worn instructions" - top_pad="8" - word_wrap="true" + top_delta="2" width="373"> - Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. + Put on a new tattoo by dragging one from your inventory +to your avatar. Alternately, you create a new one from +scratch and wear it. </text> <text type="string" @@ -3264,7 +3265,6 @@ left_delta="0" name="no modify instructions" top_delta="0" - word_wrap="true" width="373"> You do not have permission to modify this wearable. </text> @@ -3327,7 +3327,7 @@ left_delta="0" name="Create New" top_delta="-121" - width="160" /> + width="120" /> <button follows="left|top" height="23" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 0fac6cd5f1..b01c0edc8b 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -123,7 +123,7 @@ layout="topleft" left_delta="0" name="check reset home" - tool_tip="When Resident teleports out, reset their home to the destination position." + tool_tip="When resident teleports out, reset their home to the destination position." top_pad="4" width="180"> <check_box.commit_callback diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index a21242ffe1..92a6111759 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -26,7 +26,7 @@ </multi_floater.string> <multi_floater.string name="muted_message"> - You have blocked this Resident. Sending a message will automatically unblock them. + You have blocked this resident. Sending a message will automatically unblock them. </multi_floater.string> <multi_floater.string name="generic_request_error"> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index ae686d9ab7..920f0c909a 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -4,8 +4,8 @@ border_drop_shadow_visible="false" drop_shadow_visible="false" border="false" - bg_opaque_image="Window_Foreground" - bg_alpha_image="Window_Background" + bg_opaque_image="Inspector_Background" + bg_alpha_image="Toast_Background" bg_alpha_color="0 0 0 0" legacy_header_height="18" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index aa219b9615..f1a75bfcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -201,11 +201,11 @@ name="Age__Age_play" value="31" /> <combo_box.item - label="Age > Adult Resident on Teen Second Life" + label="Age > Adult resident on Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life" value="32" /> <combo_box.item - label="Age > Underage Resident outside of Teen Second Life" + label="Age > Underage resident outside of Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index 4e89df5a73..93aa1f0e31 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -15,12 +15,13 @@ follows="left|top" height="30" layout="topleft" - left="30" + left="10" name="Save item as:" top="25" word_wrap="true" - width="180"> - Press a key to set your Speak button trigger. + width="220"> + Press a key to set your +Speak button trigger. </text> <button height="23" @@ -29,6 +30,5 @@ layout="topleft" right="-10" name="Cancel" - top_pad="8" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b06c6dc215..68bb500c78 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -9,7 +9,7 @@ name="top_objects" help_topic="top_objects" title="Top Objects" - width="800"> + width="550"> <floater.string name="top_scripts_title"> Top Scripts @@ -64,7 +64,7 @@ multi_select="true" name="objects_list" top_delta="17" - width="780"> + width="530"> <scroll_list.columns label="Score" name="score" @@ -84,15 +84,11 @@ <scroll_list.columns label="Time" name="time" - width="150" /> + width="100" /> <scroll_list.columns label="Mono Time" name="mono_time" - width="100" /> - <scroll_list.columns - label="URLs" - name="URLs" - width="100" /> + width="55" /> <scroll_list.commit_callback function="TopObjects.CommitObjectsList" /> </scroll_list> @@ -116,7 +112,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="575" /> + width="325" /> <button follows="bottom|right" height="23" @@ -148,7 +144,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="575" /> + width="325" /> <button follows="bottom|right" height="23" @@ -180,7 +176,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="575" /> + width="325" /> <button follows="bottom|right" height="23" @@ -194,7 +190,7 @@ function="TopObjects.GetByOwnerName" /> </button> <button - follows="bottom|right" + follows="top|left" height="22" image_overlay="Refresh_Off" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index 5e168fe4aa..1adb824e2a 100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -49,9 +49,9 @@ left_delta="0" name="tos_heading" top_delta="-399" - word_wrap="true" width="552"> - Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement. + Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], +you must accept the agreement. </text> <web_browser follows="left|top" @@ -60,6 +60,6 @@ left_delta="0" name="tos_html" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" - top_delta="40" + top_delta="0" width="568" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index ae198d69a3..b9649e9c57 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -3,9 +3,9 @@ can_resize="true" can_minimize="true" can_close="false" - height="275" + height="270" layout="topleft" - min_height="100" + min_height="122" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" @@ -33,23 +33,27 @@ name="no_one_near"> No one near has voice enabled </string> - <layout_stack - clip="false" - follows="all" - height="262" + <string + name="max_visible_items"> + 5 + </string> + <panel + bevel_style="out" + border="true" + follows="left|right|top" + height="62" + layout="topleft" + left="0" + name="control_panel" + top="0" + width="282"> + <panel + height="18" + follows="top|left|right" layout="topleft" left="10" - mouse_opaque="false" - name="my_call_stack" - orientation="vertical" + name="my_panel" width="263"> - <layout_panel - follows="top|left|right" - user_resize="false" - auto_resize="false" - layout="topleft" - height="26" - name="my_panel"> <avatar_icon enabled="false" follows="left|top" @@ -75,57 +79,92 @@ <output_monitor auto_update="true" draw_border="false" - follows="top|right" + follows="right" height="16" layout="topleft" name="speaking_indicator" - left_pad="5" + right="-1" + top="2" visible="true" width="20" /> - </layout_panel> + </panel> + <layout_stack + border_size="0" + clip="false" + follows="all" + height="28" + layout="topleft" + left="10" + mouse_opaque="false" + name="leave_call_stack" + orientation="horizontal" + top_pad="5" + width="263"> + <layout_panel + auto_resize="true" + follows="left|right" + height="26" + layout="topleft" + min_height="23" + min_width="5" + mouse_opaque="false" + name="left_anchor" + width="80"/> <layout_panel auto_resize="false" - user_resize="false" - follows="top|left" + follows="left|right" height="26" - visible="true" layout="topleft" + mouse_opaque="false" + min_height="24" + min_width="100" name="leave_call_btn_panel" width="100"> <button - follows="right|top" - height="23" - top_pad="0" + follows="left|right" + height="24" label="Leave Call" + left="0" name="leave_call_btn" + top="0" width="100" /> </layout_panel> - <layout_panel - follows="all" - layout="topleft" - left="2" - top_pad="0" - height="205" - name="callers_panel" - user_resize="false" - width="280"> - <avatar_list - follows="all" - height="205" - ignore_online_status="true" - layout="topleft" - multi_select="true" - name="speakers_list" - width="280" /> - <panel - filename="panel_avatar_list_item.xml" - follows="left|right|top" - height="24" + <layout_panel + auto_resize="true" + follows="left|right" + height="26" layout="topleft" - left="0" - name="non_avatar_caller" - top="10" - width="276" /> - </layout_panel> - </layout_stack> + mouse_opaque="false" + min_height="24" + min_width="5" + name="right_anchor" + width="80"/> + </layout_stack> + </panel> + <avatar_list + follows="all" + height="197" + ignore_online_status="true" + layout="topleft" + left="0" + multi_select="true" + name="speakers_list" + width="282" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="topleft" + left="0" + name="non_avatar_caller" + top="70" + width="282" /> + <view_border + bevel_style="out" + follows="left|top|right|bottom" + height="206" + layout="topleft" + left="0" + top="63" + width="282" /> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml deleted file mode 100644 index 0221397a8c..0000000000 --- a/indra/newview/skins/default/xui/en/inspect_toast.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- - Not can_close / no title to avoid window chrome - Single instance - only have one at a time, recycle it each spawn ---> -<floater - legacy_header_height="25" - bevel_style="in" - bg_opaque_image="Inspector_Background" - can_close="false" - can_minimize="false" - height="148" - layout="topleft" - name="inspect_toast" - single_instance="true" - sound_flags="0" - visible="true" - width="228"> -</floater> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 45100eb1ff..fa7e3e86a3 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -198,6 +198,40 @@ function="Floater.Toggle" parameter="nearby_media" /> </menu_item_check> + <!--menu_item_check + label="Block List" + layout="topleft" + name="Mute List"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="mute" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="mute" /> + </menu_item_check--> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="(Legacy) Communicate" + layout="topleft" + name="Instant Message" + shortcut="control|T"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="communicate" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="communicate" /> + </menu_item_check> + <menu_item_call + label="(Temp) Media Remote Ctrl" + layout="topleft" + name="Preferences" + shortcut="control|alt|M"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="media_remote_ctrl" /> + </menu_item_call> </menu> <menu label="World" @@ -249,7 +283,7 @@ </menu_item_call> <menu create_jump_keys="true" - label="Place Profile" + label="About This Place" layout="topleft" name="Land" tear_off="true"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5ec8018eae..eb82dd4a7f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -246,7 +246,7 @@ Save all changes to clothing/body parts? icon="alertmodal.tga" name="GrantModifyRights" type="alertmodal"> -Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]? <usetemplate name="okcancelbuttons" @@ -258,7 +258,7 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]? icon="alertmodal.tga" name="GrantModifyRightsMultiple" type="alertmodal"> -Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for the selected Residents? <usetemplate name="okcancelbuttons" @@ -1597,8 +1597,7 @@ Unable to force land ownership because selection spans multiple regions. Please icon="alertmodal.tga" name="ForceOwnerAuctionWarning" type="alertmodal"> -This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun. -Force ownership? +This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -2918,16 +2917,6 @@ You have reached your maximum number of groups. Please leave another group befor <notification icon="alert.tga" - name="JoinedTooManyGroups" - type="alert"> -You have reached your maximum number of groups. Please leave some group before joining or creating a new one. - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - icon="alert.tga" name="KickUser" type="alert"> Kick this user with what message? @@ -3564,7 +3553,7 @@ Type a short announcement which will be sent to everyone in this region. The maturity rating for this region has been updated. It may take some time for the change to be reflected on the map. -To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification. +To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification. </notification> <notification @@ -4554,8 +4543,8 @@ Click on any landmark to select it, then click 'Teleport' at the botto icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> -You can contact Residents like '[NAME]' by opening the People panel on the right side of your screen. -Select the Resident from the list, then click 'IM' at the bottom of the panel. +You can contact residents like '[NAME]' by opening the People panel on the right side of your screen. +Select the resident from the list, then click 'IM' at the bottom of the panel. (You can also double-click on their name in the list, or right-click and choose 'IM'). </notification> @@ -4704,7 +4693,7 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have icon="notify.tga" name="OtherObjectsReturned2" type="notify"> -The objects on the selected parcel of land owned by the Resident '[NAME]' have been returned to their owner. +The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. </notification> <notification @@ -4985,7 +4974,7 @@ No valid parcel could be found. icon="notify.tga" name="ObjectGiveItem" type="offer"> -An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]: +An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -5007,7 +4996,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC icon="notify.tga" name="ObjectGiveItemUnknownUser" type="offer"> -An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]: +An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -5029,7 +5018,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th icon="notify.tga" name="UserGiveItem" type="offer"> -[NAME_SLURL] has given you this [OBJECTTYPE]: +[NAME_SLURL] has given you [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -5192,7 +5181,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th name="OfferCallingCard" type="notify"> [FIRST] [LAST] is offering their calling card. -This will add a bookmark in your inventory so you can quickly IM this Resident. +This will add a bookmark in your inventory so you can quickly IM this resident. <form name="form"> <button index="0" diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml index 28a6995186..6c54532a3a 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -4,7 +4,7 @@ follows="all" height="215" name="panel_im_control_panel" - width="150"> + width="180"> <layout_stack mouse_opaque="false" border_size="0" @@ -16,16 +16,15 @@ name="vertical_stack" orientation="vertical" top="0" - width="147"> + width="177"> <layout_panel auto_resize="true" follows="top|left" height="130" layout="topleft" - left="0" min_height="0" mouse_opaque="false" - width="147" + width="180" top="0" name="speakers_list_panel" user_resize="false"> @@ -40,7 +39,7 @@ show_info_btn="false" show_profile_btn="false" show_speaking_indicator="false" - width="147" /> + width="180" /> </layout_panel> <layout_panel auto_resize="false" @@ -48,7 +47,7 @@ height="25" layout="topleft" min_height="25" - width="130" + width="160" name="call_btn_panel" user_resize="false" visible="false"> @@ -57,7 +56,7 @@ height="20" label="Call" name="call_btn" - width="130" + width="160" top="5" /> </layout_panel> <layout_panel @@ -66,7 +65,7 @@ height="25" layout="topleft" min_height="25" - width="130" + width="160" name="end_call_btn_panel" user_resize="false" visible="false"> @@ -83,7 +82,7 @@ height="25" layout="topleft" min_height="25" - width="130" + width="160" name="voice_ctrls_btn_panel" user_resize="false" visible="false"> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index 615ade99a2..45f9d9c7b6 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -58,13 +58,13 @@ top="6" use_ellipses="true" value="Unknown" - width="180" /> + width="182" /> <text follows="right" font="SansSerifSmall" height="15" layout="topleft" - left_pad="5" + left_pad="8" name="last_interaction" text_color="LtGray_50" value="0s" @@ -75,7 +75,7 @@ draw_border="false" height="16" layout="topleft" - left_pad="5" + left_pad="0" mouse_opaque="true" name="speaking_indicator" visible="true" @@ -98,7 +98,6 @@ left_pad="5" right="-3" name="profile_btn" - tool_tip="View profile" top_delta="-2" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 39170b90ca..003e1baa7e 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -37,7 +37,7 @@ layout="topleft" left="5" name="blocked" - tool_tip="List of currently blocked Residents" + tool_tip="List of currently blocked residents" top="30" width="270" /> <button @@ -47,7 +47,7 @@ layout="topleft" left_delta="0" name="Block resident..." - tool_tip="Pick a Resident to block" + tool_tip="Pick a resident to block" top_pad="4" width="210"> <button.commit_callback @@ -74,7 +74,7 @@ layout="topleft" left_delta="0" name="Unblock" - tool_tip="Remove Resident or object from blocked list" + tool_tip="Remove resident or object from blocked list" top_pad="4" width="210" > <button.commit_callback diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 4b39210f30..aeaa049f1f 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -33,10 +33,10 @@ height="10" image_name="spacer24.tga" layout="topleft" - min_width="2" + min_width="4" left="0" top="0" - width="2" /> + width="4" /> <layout_panel mouse_opaque="false" auto_resize="false" @@ -71,7 +71,7 @@ layout="topleft" left="0" name="talk" - top="5" + top="4" width="100"> <show_button> <show_button.init_callback @@ -103,20 +103,20 @@ min_width="52" name="gesture_panel" user_resize="false"> - <gesture_combo_list + <gesture_combo_box follows="left|right" height="23" label="Gesture" layout="topleft" name="Gesture" left="0" - top="5" + top="4" width="82" tool_tip="Shows/hides gestures"> - <gesture_combo_list.combo_button + <gesture_combo_box.drop_down_button pad_right="10" use_ellipses="true" /> - </gesture_combo_list> + </gesture_combo_box> </layout_panel> <icon auto_resize="false" @@ -153,7 +153,7 @@ layout="topleft" name="movement_btn" tool_tip="Shows/hides movement controls" - top="5" + top="4" width="80"> <button.init_callback function="Button.SetDockableFloaterToggle" @@ -195,7 +195,7 @@ layout="topleft" left="0" tool_tip="Shows/hides camera controls" - top="5" + top="4" name="camera_btn" width="80"> <button.init_callback @@ -235,7 +235,7 @@ layout="topleft" name="snapshots" width="36" - top="5" + top="4" is_toggle="true" image_overlay="Snapshot_Off" tool_tip="Take snapshot"> @@ -338,7 +338,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. layout="topleft" left="0" name="im_well" - top="5" + top="4" width="35"> <!-- Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button @@ -362,6 +362,8 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well label_color="Black" left="0" name="Unread IM messages" + pad_left="0" + pad_right="0" tool_tip="Conversations" width="35" > <button.init_callback @@ -379,8 +381,8 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well top="0" left_pad="3" name="notification_well_panel" - width="40" - min_width="40" + width="35" + min_width="35" user_resize="false"> <chiclet_notification flash_period="0.25" @@ -390,7 +392,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well left="0" max_displayed_count="99" name="notification_well" - top="5" + top="4" width="35"> <button bottom_pad="3" @@ -403,11 +405,11 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well follows="right" flash_color="ChicletFlashColor" label_color="Black" - left="0" + left="5" name="Unread" image_overlay="Notices_Unread" image_overlay_alignment="center" - pad_right="15" + pad_right="5" tool_tip="Notifications" width="35" > <button.init_callback @@ -416,5 +418,16 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well </button> </chiclet_notification> </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + min_width="4" + right="-1" + top="0" + width="4"/> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 7769189219..d6de5af32d 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -38,27 +38,28 @@ <scroll_container color="DkGray2" follows="all" - height="500" + height="510" layout="topleft" left="10" top_pad="10" name="profile_scroll" + reserve_scroll_corner="false" opaque="true" width="313"> <panel name="scroll_content_panel" - follows="left|top|right" + follows="left|top" min_height="300" layout="topleft" top="0" background_visible="false" - height="500" + height="510" left="0" - width="285"> + width="295"> <texture_picker follows="left|top|right" height="197" - width="280" + width="290" layout="topleft" top="20" left="10" @@ -76,7 +77,7 @@ <text type="string" length="1" - follows="left|top|right" + follows="left|top" height="15" font="SansSerifSmall" font.style="BOLD" @@ -85,7 +86,7 @@ top="215" name="Name:" text_color="white" - width="280"> + width="290"> Title: </text> <line_editor @@ -98,11 +99,11 @@ max_length="63" name="pick_name" text_color="black" - width="280" /> + width="290" /> <text type="string" length="1" - follows="left|top|right" + follows="left|top" height="15" font="SansSerifSmall" font.style="BOLD" @@ -111,13 +112,13 @@ top_pad="20" name="description_label" text_color="white" - width="280"> + width="290"> Description: </text> <text_editor follows="left|top|right" height="100" - width="280" + width="290" hide_scrollbar="false" layout="topleft" left="10" @@ -131,26 +132,27 @@ length="1" font="SansSerifSmall" font.style="BOLD" - follows="left|top|right" + follows="left|top" height="15" layout="topleft" left="10" name="location_label" text_color="white" top_pad="20" - width="280"> + width="290"> Location: </text> <text type="string" length="1" - follows="left|top|right" + follows="left|top" height="50" layout="topleft" left="10" name="pick_location" + right="-10" top_pad="2" - width="280" + width="290" word_wrap="true"> loading... </text> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 172cf18fc4..be3c0bbd96 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -301,13 +301,14 @@ left="10" name="partner_data_panel" width="285"> - <name_box + <text follows="left|top|right" height="30" layout="topleft" left="0" name="partner_text" top="0" + value="[FIRST] [LAST]" width="285" word_wrap="true" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml index c315adb33e..ac731bcdf0 100644 --- a/indra/newview/skins/default/xui/en/panel_friends.xml +++ b/indra/newview/skins/default/xui/en/panel_friends.xml @@ -118,7 +118,7 @@ layout="topleft" left_delta="0" name="add_btn" - tool_tip="Offer friendship to a Resident" + tool_tip="Offer friendship to a resident" top_pad="13" width="80" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index aa7d621e4c..4073ef158b 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -4,7 +4,7 @@ follows="all" height="238" name="panel_im_control_panel" - width="150"> + width="180"> <layout_stack mouse_opaque="false" border_size="0" @@ -16,7 +16,7 @@ name="vertical_stack" orientation="vertical" top="0" - width="145"> + width="175"> <layout_panel auto_resize="true" follows="top|left" @@ -24,7 +24,7 @@ layout="topleft" min_height="0" mouse_opaque="false" - width="145" + width="180" top="0" name="speakers_list_panel" user_resize="false"> @@ -39,7 +39,7 @@ show_info_btn="false" show_profile_btn="false" show_speaking_indicator="false" - width="145" /> + width="180" /> </layout_panel> <layout_panel auto_resize="false" @@ -47,7 +47,7 @@ height="28" layout="topleft" min_height="28" - width="130" + width="160" name="group_info_btn_panel" user_resize="false"> <button @@ -57,7 +57,7 @@ name="group_info_btn" use_ellipses="true" top="5" - width="130" /> + width="160" /> </layout_panel> <layout_panel auto_resize="false" @@ -65,7 +65,7 @@ height="28" layout="topleft" min_height="28" - width="130" + width="160" name="call_btn_panel" user_resize="false"> <button @@ -74,7 +74,7 @@ label="Call Group" name="call_btn" use_ellipses="true" - width="130" /> + width="160" /> </layout_panel> <layout_panel auto_resize="false" @@ -82,7 +82,7 @@ height="28" layout="topleft" min_height="28" - width="130" + width="160" name="end_call_btn_panel" user_resize="false" visible="false"> @@ -99,7 +99,7 @@ height="28" layout="topleft" min_height="28" - width="130" + width="160" name="voice_ctrls_btn_panel" user_resize="false" visible="false"> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 8188048821..c0db734f8c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -216,28 +216,12 @@ background_visible="true" visible="false" width="65" />--> <button - follows="bottom|right" - label="Group Chat" - name="btn_chat" - right="-184" - left_pad="2" - height="22" - width="85" /> - <button - follows="bottom|right" - label="Group Call" - name="btn_call" - right="-97" - left_pad="2" - height="22" - width="85" /> - <button height="22" label="Save" label_selected="Save" name="btn_apply" left_pad="10" right="-10" - width="85" /> + width="100" /> </panel> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml index 48083b7677..37578eae70 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -17,7 +17,7 @@ </panel.string> <panel.string name="already_in_group"> - Some Residents you chose are already in the group, and so were not sent an invitation. + Some avatars are already in group and were not invited. </panel.string> <text type="string" @@ -26,10 +26,11 @@ layout="topleft" left="7" name="help_text" - top="28" - word_wrap="true" + top="24" width="200"> - You can select multiple Residents to invite to your group. Click 'Open Resident Chooser' to start. + You can select multiple residents to +invite to your group. Click 'Open +Resident Chooser' to start. </text> <button height="20" @@ -47,7 +48,7 @@ left_delta="0" multi_select="true" name="invitee_list" - tool_tip="Hold the Ctrl key and click Resident names to multi-select" + tool_tip="Hold the Ctrl key and click resident names to multi-select" top_pad="4" width="200" /> <button @@ -56,7 +57,7 @@ layout="topleft" left_delta="0" name="remove_button" - tool_tip="Removes the Residents selected above from the invite list" + tool_tip="Removes residents selected above from the invite list" top_pad="4" width="200" /> <text @@ -67,7 +68,6 @@ left_delta="4" name="role_text" top_pad="5" - word_wrap="true" width="200"> Choose what Role to assign them to: </text> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml index c243d08b97..5f6b911620 100644 --- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -65,7 +65,6 @@ left_pad="5" right="-3" name="profile_btn" - tool_tip="View profile" top_delta="-2" width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 0d9c2c2162..e096715cee 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -136,7 +136,6 @@ Maximum 200 per group daily left_pad="3" max_length="63" name="create_subject" - prevalidate_callback="ascii" width="220" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 6b3fb04549..a5bab3232c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -210,18 +210,6 @@ including the Everyone and Owner Roles. Abilities allow Members in Roles to do specific things in this group. There's a broad variety of Abilities. </panel.string> - <panel.string - name="power_folder_icon"> - Inv_FolderClosed - </panel.string> - <panel.string - name="power_all_have_icon"> - Checkbox_On - </panel.string> - <panel.string - name="power_partial_icon"> - Checkbox_Off - </panel.string> <filter_editor layout="topleft" top="5" @@ -232,32 +220,23 @@ things in this group. There's a broad variety of Abilities. max_length="250" label="Filter Abilities" name="filter_input" /> - - <scroll_list - column_padding="0" - draw_stripes="true" - height="200" - follows="left|top" - layout="topleft" - left="0" - name="action_list" - search_column="2" - tool_tip="Select an Ability to view more details" - top_pad="5" - width="300"> - <scroll_list.columns - label="" - name="icon" - width="2" /> - <scroll_list.columns - label="" - name="checkbox" - width="20" /> - <scroll_list.columns - label="" - name="action" - width="270" /> - </scroll_list> + <scroll_list + column_padding="0" + draw_stripes="false" + follows="left|top" + height="200" + layout="topleft" + left="0" + multi_select="true" + name="action_list" + search_column="1" + tool_tip="Select an Ability to view more details" + top_pad="5" + width="300"> + <scroll_list.columns + name="action" + width="300" /> + </scroll_list> </panel> </tab_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index df942b1a26..e5df37e366 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -186,7 +186,6 @@ height="80"> <text follows="right|bottom" font="SansSerifSmall" -text_color="EmphasisColor" halign="right" height="16" top="12" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 38e8b9844f..5217ab3571 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -30,7 +30,6 @@ (This page does not pass the specified whitelist) </text> <line_editor - max_length="1024" bottom_delta="-24" enabled="true" follows="left|top" @@ -73,15 +72,13 @@ Current Page: </text> <text - name="current_url" - max_length="1024" - use_ellipses="true" bottom_delta="-20" enabled="false" follows="left|top" font="SansSerif" height="20" left="10" + name="current_url" tool_tip="The current page for this media source" value="" width="340" /> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 27c1af1860..8327edfdd0 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -28,9 +28,6 @@ name="no_partner_text" value="None" /> <string - name="no_group_text" - value="None" /> - <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> @@ -65,11 +62,10 @@ <panel layout="topleft" follows="left|top|right" - height="505" name="scroll_content_panel" top="0" left="0" - width="297"> + width="303"> <panel follows="left|top|right" height="117" @@ -77,7 +73,7 @@ left="10" name="second_life_image_panel" top="0" - width="297"> + width="300"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -118,7 +114,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" - width="181" + width="188" expanded_bg_visible="true" expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. @@ -131,7 +127,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="297"> + width="300"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -171,7 +167,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" - width="181" + width="188" expanded_bg_visible="true" expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. @@ -264,14 +260,14 @@ name="partner_data_panel" top_pad="0" width="300"> - <name_box + <text follows="left|top" height="10" layout="topleft" left="0" - link="true" name="partner_text" top="0" + value="[FIRST] [LAST]" width="300" word_wrap="true" /> </panel> @@ -316,7 +312,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the Resident" + tool_tip="Offer friendship to the resident" top="5" width="80" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 9ad99b1f13..e2884dbedc 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -47,7 +47,7 @@ left="10" name="back_btn" tool_tip="Go back to previous location" - top="2" + top="3" width="31" /> <button follows="left|top" @@ -92,6 +92,7 @@ width="20" /> --> </location_input> + <!-- <button --> <!-- follows="right|top" --> <!-- height="20" --> @@ -107,6 +108,7 @@ <!-- name="search_bg" --> <!-- top_delta="0" --> <!-- width="168" /> --> + <search_combo_box bevel_style="none" border_style="line" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 2b361c0628..f09a0e03ed 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -27,7 +27,7 @@ max_length="512" name="chat_box" tool_tip="Press Enter to say, Ctrl+Enter to shout" - top="2" + top="1" width="283" /> <output_monitor auto_update="true" @@ -45,7 +45,7 @@ follows="right" is_toggle="true" width="20" - top="2" + top="1" layout="topleft" left_pad="4" image_disabled="ComboButton_UpOff" diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 45b64d5e26..73528b28ad 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -120,7 +120,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the Resident" + tool_tip="Offer friendship to the resident" top="5" width="80" /> <button @@ -139,7 +139,7 @@ label="Call" layout="topleft" name="call" - tool_tip="Call this Resident" + tool_tip="Call this resident" left_pad="3" top="5" width="45" /> @@ -150,7 +150,7 @@ label="Map" layout="topleft" name="show_on_map_btn" - tool_tip="Show the Resident on the map" + tool_tip="Show the resident on the map" top="5" left_pad="3" width="45" /> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 8a02637817..adf22f825f 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -106,7 +106,7 @@ background_visible="true" left_pad="5" name="add_friend_btn" top_delta="0" - tool_tip="Add selected Resident to your friends List" + tool_tip="Add selected resident to your friends List" width="18"> <commit_callback function="People.addFriend" /> @@ -192,7 +192,7 @@ background_visible="true" layout="topleft" left_pad="5" name="add_btn" - tool_tip="Offer friendship to a Resident" + tool_tip="Offer friendship to a resident" top_delta="0" width="18" /> <button @@ -327,7 +327,7 @@ background_visible="true" left_pad="5" name="add_friend_btn" top_delta="0" - tool_tip="Add selected Resident to your friends List" + tool_tip="Add selected resident to your friends List" width="18"> <commit_callback function="People.addFriend" /> @@ -350,7 +350,7 @@ background_visible="true" label="Profile" layout="topleft" name="view_profile_btn" - tool_tip="Show picture, groups, and other Residents information" + tool_tip="Show picture, groups, and other residents information" width="70" /> <button follows="bottom|left" @@ -370,7 +370,7 @@ background_visible="true" label="Call" layout="topleft" name="call_btn" - tool_tip="Call this Resident" + tool_tip="Call this resident" width="50" /> <button follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 9c7f38e688..f68202d287 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -40,30 +40,31 @@ left="10" top_pad="10" name="profile_scroll" + reserve_scroll_corner="false" width="313"> <panel name="scroll_content_panel" - follows="left|top|right" + follows="left|top" min_height="300" layout="topleft" top="0" background_visible="false" - height="400" + height="470" left="0" - width="285"> + width="295"> <texture_picker enabled="false" - follows="left|top|right" + follows="left|top" height="197" layout="topleft" left="10" name="pick_snapshot" top="20" - width="280" /> + width="290" /> <text follows="left|top|right" height="35" - width="280" + width="290" layout="topleft" font="SansSerifBig" font.style="BOLD" @@ -74,29 +75,23 @@ value="[name]" use_ellipses="true" /> <text - follows="left|top|right" + follows="left|top" height="25" layout="topleft" left="10" name="pick_location" - width="280" + width="290" word_wrap="true" value="[loading...]" /> - <text_editor - bg_readonly_color="DkGray2" - follows="all" - height="100" - width="280" - hide_scrollbar="false" + <text + follows="left|top|right" + height="280" layout="topleft" left="10" - top_pad="2" - max_length="1023" name="pick_desc" - read_only="true" - text_readonly_color="white" + width="290" value="[description]" - wrap="true" /> + word_wrap="true" /> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 1e7acb566f..17651b8caa 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -2,6 +2,7 @@ <panel border="true" + background_visible="true" follows="left|top|right|bottom" height="408" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 22c75a595e..c98555735a 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -260,7 +260,7 @@ width="200"> My effects: </text> - <text + <text type="string" length="1" follows="left|top" @@ -270,23 +270,16 @@ name="title_afk_text" width="190"> Away timeout: - </text> + </text> <color_swatch - can_apply_immediately="true" + control_name="EffectColor" follows="left|top" height="50" layout="topleft" left="50" name="effect_color_swatch" tool_tip="Click to open Color Picker" - width="38"> - <color_swatch.init_callback - function="Pref.getUIColor" - parameter="EffectColor" /> - <color_swatch.commit_callback - function="Pref.applyUIColor" - parameter="EffectColor" /> - </color_swatch> + width="38" /> <combo_box height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index a0fcf59fc8..cc00abf5a0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -378,7 +378,7 @@ layout="topleft" left_delta="250" name="DrawDistanceMeterText2" - top_delta="0" + top_delta="1" width="128"> m </text> @@ -395,7 +395,7 @@ left="216" max_val="8192" name="MaxParticleCount" - top_pad="7" + top_pad="6" width="262" /> <slider control_name="RenderGlowResolutionPow" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index ab6384203f..075d9232b1 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -321,7 +321,6 @@ min_width="90"> <line_editor name="media_address_url" - max_length="1024" follows="top|left|right" height="22" top="0" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 597b6410cd..43947262ec 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -28,9 +28,6 @@ name="no_partner_text" value="None" /> <string - name="no_group_text" - value="None" /> - <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> @@ -65,11 +62,10 @@ <panel layout="topleft" follows="left|top|right" - height="505" name="profile_scroll_panel" top="0" left="0" - width="297"> + width="303"> <panel follows="left|top|right" height="117" @@ -77,7 +73,7 @@ left="10" name="second_life_image_panel" top="0" - width="297"> + width="303"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -121,7 +117,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="297"> + width="303"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -244,14 +240,14 @@ name="partner_data_panel" top_pad="0" width="300"> - <name_box + <text follows="left|top" height="10" layout="topleft" left="0" - link="true" name="partner_text" top="0" + value="[FIRST] [LAST]" width="300" word_wrap="true" /> </panel> @@ -273,7 +269,7 @@ left="7" name="sl_groups" top_pad="0" - width="290" + width="298" expanded_bg_visible="true" expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm. @@ -296,7 +292,7 @@ left="0" mouse_opaque="false" name="add_friend" - tool_tip="Offer friendship to the Resident" + tool_tip="Offer friendship to the resident" top="5" width="80" /> <button @@ -315,7 +311,7 @@ label="Call" layout="topleft" name="call" - tool_tip="Call this Resident" + tool_tip="Call this resident" left_pad="3" top="5" width="45" /> @@ -326,7 +322,7 @@ label="Map" layout="topleft" name="show_on_map_btn" - tool_tip="Show the Resident on the map" + tool_tip="Show the resident on the map" top="5" left_pad="3" width="45" /> @@ -346,7 +342,7 @@ label="▼" layout="topleft" name="overflow_btn" - tool_tip="Pay money to or share inventory with the Resident" + tool_tip="Pay money to or share inventory with the resident" right="-1" top="5" left_pad="3" @@ -379,4 +375,4 @@ </layout_panel> </layout_stack> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index dc8f71c868..ff55090f16 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -135,8 +135,7 @@ left="120" name="covenant_help_text" top_pad="10" - word_wrap="true" - width="360"> + width="460"> Changes to the covenant will show on all parcels in the estate. </text> <text @@ -146,10 +145,9 @@ left_delta="0" name="covenant_instructions" top_pad="5" - word_wrap="true" - font.style="ITALIC" - width="360"> - Drag and drop a notecard to change the Covenant for this estate. + width="465"> + Drag and drop a notecard to change + the Covenant for this Estate. </text> <text diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index 3980eb86d3..ba39e88024 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -19,9 +19,9 @@ left="10" name="estate_help_text" top="14" - word_wrap="true" - width="275"> - Changes to settings on this tab will affect all regions in the estate. + width="313"> + Changes to settings on this tab will affect all +regions in the estate. </text> <text type="string" @@ -138,7 +138,7 @@ name="Only Allow" top="250" width="278"> - Restrict Access to accounts verified by: + Restrict Access to Accounts Verified by: </text> <check_box follows="top|left" @@ -147,7 +147,7 @@ layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Ban unidentified Residents" + tool_tip="Ban unidentified residents" top_pad="2" width="278" /> <check_box @@ -157,7 +157,7 @@ layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information." + tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> <check_box diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml index 04dbf73be9..502a5804c3 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -292,7 +292,7 @@ name="height_text_lbl10" top_delta="30" width="400" - word_wrap="true"> + wrap="true"> These values represent the blend range for the textures above. </text> <text @@ -303,7 +303,7 @@ name="height_text_lbl11" top_delta="32" width="400" - word_wrap="true"> + wrap="true"> Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4. </text> <button diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index bfca2f2e46..00f54feabd 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -42,36 +42,18 @@ <button auto_resize="true" halign="right" - font="SansSerifSmall" - follows="right|top" - image_overlay="" - image_selected="spacer35.tga" - image_unselected="spacer35.tga" - image_pressed="spacer35.tga" - height="16" - right="-228" - label_shadow="false" - name="buycurrency" - tool_tip="My Balance" - top="5" - width="100" /> - <button - auto_resize="true" - halign="right" - font="SansSerifSmall" follows="right|top" image_selected="BuyArrow_Over" image_unselected="BuyArrow_Over" image_pressed="BuyArrow_Press" height="16" - label="Buy L$" - label_color="EmphasisColor" - left_pad="0" + right="-128" + label_color="White" label_shadow="false" - name="buyL" + name="buycurrency" pad_right="20px" - tool_tip="Click to buy more L$" - top="5" + tool_tip="My Balance: Click to buy more L$" + top="3" width="100" /> <text type="string" @@ -80,27 +62,29 @@ follows="right|bottom" halign="right" height="16" - top="7" + top="4" layout="topleft" left_pad="0" name="TimeText" + text_color="TimeTextColor" tool_tip="Current time (Pacific)" width="85"> 12:00 AM </text> <button follows="right|bottom" - height="15" + height="16" image_selected="AudioMute_Off" image_pressed="Audio_Press" image_unselected="Audio_Off" is_toggle="true" left_pad="18" - top="4" + top="1" name="volume_btn" tool_tip="Global Volume Control" width="16" /> <text + enabled="true" follows="right|bottom" halign="center" height="12" diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml deleted file mode 100644 index 60d4a7e00b..0000000000 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - background_opaque="true" - background_visible="false" - border_visible="false" - border="false" - chrome="true" - follows="bottom" - height="150" - layout="topleft" - name="volumepulldown_floater" - width="32"> - <!-- floater background image --> - <icon - height="150" - image_name="Inspector_Background" - layout="topleft" - left="0" - name="normal_background" - top="0" - width="32" /> - <slider - control_name="AudioLevelMaster" - follows="left|top" - left="0" - top="1" - orientation="vertical" - height="120" - increment="0.05" - initial_value="0.5" - layout="topleft" - name="mastervolume" - show_text="false" - slider_label.halign="right" - top_pad="2" - volume="true"> - <slider.commit_callback - function="Vol.setControlFalse" - parameter="MuteAudio" /> - </slider> - <button - left="7" - top_pad="9" - width="18" - height="12" - follows="top|left" - name="prefs_btn" - image_unselected="Icon_Gear_Foreground" - image_disabled="Icon_Gear_Background" - image_pressed="Icon_Gear_Press" - scale_image="false"> - <button.commit_callback - function="Vol.GoAudioPrefs" /> - </button> -</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 2dfcdf4a4c..d26e855e2f 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -153,19 +153,28 @@ layout="topleft" left="5" name="CreatorNameLabel" - top_pad="12" + top_pad="10" width="78"> Creator: </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> <text type="string" - follows="left|right|top" + follows="left|right" font="SansSerifSmall" height="15" layout="topleft" - left_pad="0" + left_pad="5" name="Creator Name" - top_delta="0" + top_delta="6" width="140"> Erica Linden </text> @@ -177,19 +186,28 @@ layout="topleft" left="5" name="Owner:" - top_pad="15" + top_pad="10" width="78"> Owner: </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> <text type="string" - follows="left|right|top" + follows="left|right" font="SansSerifSmall" height="15" layout="topleft" - left_pad="0" + left_pad="5" name="Owner Name" - top_delta="0" + top_delta="6" width="140"> Erica Linden </text> @@ -201,7 +219,7 @@ layout="topleft" left="5" name="Group_label" - top_pad="15" + top_pad="10" width="78"> Group: </text> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fbdac7164d..bd868ef61e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -67,7 +67,7 @@ <!-- tooltips for Urls --> <string name="TooltipHttpUrl">Click to view this web page</string> <string name="TooltipSLURL">Click to view this location's information</string> - <string name="TooltipAgentUrl">Click to view this Resident's profile</string> + <string name="TooltipAgentUrl">Click to view this resident's profile</string> <string name="TooltipGroupUrl">Click to view this group's description</string> <string name="TooltipEventUrl">Click to view this event's description</string> <string name="TooltipClassifiedUrl">Click to view this classified</string> @@ -1609,11 +1609,11 @@ Sends an HTTP request to the specified url with the body of the request and para </string> <string name="LSLTipText_llResetLandBanList" translate="false"> llResetLandBanList() -Removes all Residents from the land ban list +Removes all residents from the land ban list </string> <string name="LSLTipText_llResetLandPassList" translate="false"> llResetLandPassList() -Removes all Residents from the land access/pass list +Removes all residents from the land access/pass list </string> <string name="LSLTipText_llGetObjectPrimCount" translate="false"> integer llGetObjectPrimCount(key object_id) @@ -1621,7 +1621,7 @@ Returns the total number of prims for an object in the region </string> <string name="LSLTipText_llGetParcelPrimOwners" translate="false"> list llGetParcelPrimOwners(vector pos) -Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts. +Returns a list of all residents who own objects on the parcel at pos and with individual prim counts. Requires owner-like permissions for the parcel. </string> <string name="LSLTipText_llGetParcelPrimCount" translate="false"> @@ -1808,7 +1808,7 @@ Clears (deletes) the media and all params from the given face. <!-- inventory --> <string name="InventoryNoMatchingItems">No matching items found in inventory.</string> - <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> + <string name="FavoritesNoMatchingItems">Drag and drop a landmark here to add to your favorites.</string> <string name="InventoryNoTexture"> You do not have a copy of this texture in your inventory @@ -2040,7 +2040,7 @@ this texture in your inventory <string name="RegionInfoAllEstatesYouManage"> all estates that you manage for [OWNER] </string> - <string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> + <string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> <string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string> <!-- script limits floater --> @@ -2111,7 +2111,7 @@ this texture in your inventory <!-- Mute --> <string name="MuteByName">(by name)</string> - <string name="MuteAgent">(Resident)</string> + <string name="MuteAgent">(resident)</string> <string name="MuteObject">(object)</string> <string name="MuteGroup">(group)</string> @@ -2938,7 +2938,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Click the [BUTTON NAME] button to accept/connect to this voice chat. </string> <string name="muted_message"> - You have blocked this Resident. Sending a message will automatically unblock them. + You have blocked this resident. Sending a message will automatically unblock them. </string> <!--Some times string name is getting from the body of server response. For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 693c43f141..af0d338256 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_adhoc + font="SansSerif" height="25" name="im_adhoc_chiclet" show_speaker="false" @@ -11,14 +12,15 @@ left="25" name="speaker" visible="false" - width="20" /> + width="20"/> <chiclet_im_adhoc.avatar_icon follows="left|top|bottom" height="22" mouse_opaque="true" name="adhoc_icon" - width="22" /> + width="22"/> <chiclet_im_adhoc.unread_notifications + font="SansSerif" font_halign="center" height="25" left="25" @@ -27,13 +29,13 @@ text_color="white" v_pad="5" visible="false" - width="20" /> + width="20"/> <chiclet_im_adhoc.new_message_icon - bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> + bottom="12" + height="13" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="13" /> </chiclet_im_adhoc>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index f4fc58701c..b1988a2d20 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_group + font="SansSerif" height="25" name="im_group_chiclet" show_speaker="false" @@ -11,17 +12,17 @@ left="25" name="speaker" visible="false" - width="20" /> + width="20"/> <chiclet_im_group.group_icon default_icon="Generic_Group" follows="left|top|bottom" - height="18" - bottom_pad="4" + height="22" mouse_opaque="true" name="group_icon" - width="18" /> + width="22"/> <chiclet_im_group.unread_notifications height="25" + font="SansSerif" font_halign="center" left="25" mouse_opaque="false" @@ -31,11 +32,11 @@ visible="false" width="20"/> <chiclet_im_group.new_message_icon -bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> + bottom="12" + height="13" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="13" /> </chiclet_im_group>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 535113f717..52fbce0de7 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_p2p + font="SansSerif" height="25" name="im_p2p_chiclet" show_speaker="false" @@ -17,9 +18,10 @@ height="22" mouse_opaque="true" name="avatar_icon" - width="22" /> + width="22"/> <chiclet_im_p2p.unread_notifications height="25" + font="SansSerif" font_halign="center" left="25" mouse_opaque="false" @@ -29,11 +31,11 @@ visible="false" width="20"/> <chiclet_im_p2p.new_message_icon - bottom="11" - height="14" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="14" /> + bottom="12" + height="13" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="13" /> </chiclet_im_p2p>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 86bea9be50..33f85a964c 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_offer + font="SansSerif" height="25" name="offer_chiclet" width="25"> <chiclet_offer.icon - default_icon="Generic_Object_Small" + default_icon="Generic_Object_Small" follows="all" - height="20" + height="22" mouse_opaque="false" name="chiclet_icon" - bottom_pad="2" - width="20" /> + width="22"/> <chiclet_offer.new_message_icon - bottom="11" - height="14" + bottom="12" + height="13" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="14" /> + width="13" /> </chiclet_offer>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index b1f9f5b0e8..560c8e6ea5 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_script + font="SansSerif" height="25" name="script_chiclet" width="25"> <chiclet_script.icon follows="all" - height="20" - image_name="Generic_Object_Small" + height="22" + image_name="Generic_Object_Small" mouse_opaque="false" name="chiclet_icon" - width="20" - bottom_pad="2" /> + width="22"/> <chiclet_script.new_message_icon - bottom="11" - height="14" + bottom="12" + height="13" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="14" /> + width="13" /> </chiclet_script>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml new file mode 100644 index 0000000000..4229f34c09 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<gesture_combo_box + label="Gestures" + list_position="below" + max_chars="20" + follows="right|top"> + <gesture_combo_box.combo_button name="Combobox Button" + label="" + hover_glow_amount="0.15" + scale_image="true" + image_unselected="ComboButton_Off" + image_selected="ComboButton_Selected" + image_disabled="ComboButton_Disabled" + image_disabled_selected="ComboButton_Disabled_Selected" /> + <gesture_combo_box.drop_down_button name="Drop Down Button" + label="" + halign="center" + hover_glow_amount="0.15" + scale_image="true" + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_unselected="PushButton_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Selected_Disabled" /> + <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" + scroll_bar_bg_visible="false" /> + <gesture_combo_box.combo_editor name="Combo Text Entry" + select_on_focus="true" /> +</gesture_combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml deleted file mode 100644 index 808683864d..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<gesture_combo_list - follows="right|top"> - <gesture_combo_list.combo_button - name="Combolist Button" - label="" - layout="topleft" - halign="center" - hover_glow_amount="0.15" - mouse_opaque="false" - scale_image="true" - image_selected="PushButton_Selected_Press" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_unselected="PushButton_Off" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Selected_Disabled" /> - <gesture_combo_list.combo_list - bg_writeable_color="MenuDefaultBgColor" - scroll_bar_bg_visible="false" /> -</gesture_combo_list> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 1c0a8ba7c5..67bb7c1896 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -96,7 +96,7 @@ name="damage_icon" width="14" height="13" - top="25" + top="22" left="2" follows="right|top" image_name="Parcel_Damage_Dark" @@ -112,19 +112,17 @@ font="SansSerifSmall" text_color="TextFgColor" /> - <combo_button - name="Location History" - label="" - pad_right="0"/> - <combo_list - bg_writeable_color="MenuDefaultBgColor" - page_lines="10" + + <combo_button name="Location History" + label="" + pad_right="0"/> + <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" - text_pad_left="27" + text_pad_left="22" select_on_focus="false" font="SansSerifSmall" bevel_style="none" border_style="line" - border.border_thickness="0" /> + border.border_thickness="0"/> </location_input> |