diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
73 files changed, 858 insertions, 656 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index fac7aef690..b6443c4c21 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 33fdd923ad..c58c1f00b9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -209,7 +209,7 @@ </text> <button follows="right" - height="16" + height="23" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" @@ -218,7 +218,7 @@ width="16" /> <!-- <button follows="left|top" - height="16" + height="23" label="Profile" layout="topleft" left_pad="4" @@ -248,7 +248,7 @@ Leyla Linden </text> <button follows="right" - height="16" + height="23" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" @@ -263,10 +263,11 @@ Leyla Linden </text> left_pad="4" right="-10" name="Set..." - width="50" /> + width="50" + top_delta="-2"/> <check_box enabled="false" - height="23" + height="16" label="Allow Deed to Group" layout="topleft" left="108" @@ -284,7 +285,7 @@ Leyla Linden </text> right="-10" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group." - top_delta="0" + top_delta="-2" width="90" /> <check_box enabled="false" @@ -294,7 +295,8 @@ Leyla Linden </text> left="108" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it." - width="199" /> + width="199" + top_pad="0"/> <text type="string" length="1" @@ -335,7 +337,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="SalePending" - top_pad="6" + top_pad="5" width="324" /> <button follows="left|top" @@ -345,7 +347,8 @@ Leyla Linden </text> left_pad="5" right="-10" name="Sell Land..." - width="145" /> + width="145" + top_delta="-25"/> <text type="string" length="1" @@ -354,7 +357,7 @@ Leyla Linden </text> layout="topleft" left_delta="-199" name="For sale to" - top_delta="2" + top_delta="20" width="186"> For sale to: [BUYER] </text> @@ -366,7 +369,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="Sell with landowners objects in parcel." - top_pad="0" + top_pad="-3" width="186"> Objects included in sale </text> @@ -391,7 +394,7 @@ Leyla Linden </text> right="-10" name="Cancel Land Sale" left_pad="5" - top_pad="-10" + top_pad="-25" width="145" /> <text type="string" @@ -522,7 +525,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-48" + top_delta="-61" width="180" /> <button enabled="false" @@ -810,7 +813,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="152" + left_delta="190" name="objects_available" top_delta="0" width="260"> @@ -834,7 +837,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="200" + left_delta="190" name="object_contrib_text" top_delta="0" width="212"> @@ -858,7 +861,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="200" + left_delta="190" name="total_objects_text" top_delta="0" width="48"> @@ -868,7 +871,7 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Owned by parcel owner:" @@ -880,9 +883,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="owner_objects_text" top_delta="0" width="48"> @@ -892,33 +895,35 @@ Leyla Linden </text> bottom="100" enabled="false" follows="left|top" - height="20" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOwner" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="100" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnOwner..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Set to group:" - top="104" + top_pad="5" width="176"> Set to group: </text> @@ -926,9 +931,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="group_objects_text" top_delta="0" width="48"> @@ -939,32 +944,34 @@ Leyla Linden </text> enabled="false" follows="left|top" label="Show" - height="20" + height="23" label_selected="Show" layout="topleft" name="ShowGroup" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="120" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnGroup..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Owned by others:" - top="124" + top_pad="5" width="176"> Owned by others: </text> @@ -972,9 +979,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="other_objects_text" top_delta="0" width="48"> @@ -984,33 +991,35 @@ Leyla Linden </text> bottom="140" enabled="false" follows="left|top" - height="20" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOther" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="140" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnOther..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Selected / sat upon:" - top="144" + top_pad="5" width="176"> Selected / sat upon: </text> @@ -1018,9 +1027,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="selected_objects_text" top_delta="0" width="48"> @@ -1030,51 +1039,53 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Autoreturn" - top="164" + top_pad="0" width="294"> - Autoreturn other residents' objects (minutes, 0 for off): + Auto return other Residents' objects (minutes, 0 for off): </text> <line_editor border_style="line" border_thickness="1" bottom="180" follows="left|top" - height="16" + height="23" layout="topleft" max_length="6" name="clean other time" - right="-50" - width="56" /> + right="-72" + width="56" + top_delta="-6"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Object Owners:" - top="184" + top_pad="10" width="104"> Object Owners: </text> <button follows="top|right" - height="20" + height="23" image_overlay="Refresh_Off" layout="topleft" name="Refresh List" left_pad="5" right="-183" tool_tip="Refresh Object List" - width="20" /> + width="20" + top_delta="-6"/> <button enabled="false" follows="left|top" - height="20" + height="23" label="Return Objects" layout="topleft" left_pad="6" @@ -1086,7 +1097,7 @@ Leyla Linden </text> column_padding="0" draw_heading="true" follows="all" - height="190" + height="180" layout="topleft" left="10" name="owner list" @@ -1175,7 +1186,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" @@ -1313,7 +1324,7 @@ Only large parcels can be listed in search. width="430" /> <combo_box enabled="false" - height="20" + height="23" layout="topleft" left="30" name="land category with adult" @@ -1374,7 +1385,7 @@ Only large parcels can be listed in search. </combo_box> <combo_box enabled="false" - height="20" + height="23" layout="topleft" left="30" name="land category" @@ -1463,7 +1474,7 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" - height="30" + height="16" layout="topleft" left="220" top="180" @@ -1553,12 +1564,13 @@ Only large parcels can be listed in search. Type: </text> <combo_box - height="20" + height="23" layout="topleft" left_pad="0" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" - width="120" /> + width="120" + top_delta="0"/> <text follows="left|top" height="16" @@ -1574,27 +1586,29 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="at URL:" - width="100"> + width="100" + top_pad="10"> Home Page: </text> <line_editor follows="left|top" - height="20" + height="23" layout="topleft" left_pad="0" max_length="255" name="media_url" select_on_focus="true" - width="300" /> + width="300" + top_delta="0"/> <button follows="right|top" - height="22" + height="23" label="Set" layout="topleft" left_pad="5" - right="-10" name="set_media_url" - width="50" /> + width="50" + top_delta="0"/> <text type="string" length="1" @@ -1603,18 +1617,20 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="CurrentURL:" - width="100"> + width="100" + top_pad="10"> Current Page: </text> - <button - follows="top|right" - height="20" - image_overlay="Refresh_Off" - layout="topleft" + <button + follows="top|right" + height="23" + image_overlay="Refresh_Off" + layout="topleft" name="reset_media_url" - left_pad="0" - tool_tip="Refresh URL" - width="20" /> + left_pad="0" + tool_tip="Refresh URL" + width="23" + top_delta="0"/> <text follows="left|top" height="16" @@ -1623,22 +1639,25 @@ Only large parcels can be listed in search. name="current_url" width="300" /> <check_box + follows="top|left" height="16" label="Hide URL" layout="topleft" - left="110" + left_delta="-36" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." - width="200" /> + width="50" + top_pad="5"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Description:" - width="364"> + width="364" + top_pad="10"> Description: </text> <line_editor @@ -1650,7 +1669,7 @@ Only large parcels can be listed in search. name="url_description" select_on_focus="true" tool_tip="Text displayed next to play/load button" - top_delta="10" + top_delta="0" width="300" /> <text type="string" @@ -1674,7 +1693,7 @@ Only large parcels can be listed in search. left="110" name="media texture" tool_tip="Click to choose a picture" - top_delta="10" + top_delta="0" width="64" /> <text type="string" @@ -1685,16 +1704,17 @@ Only large parcels can be listed in search. left_pad="8" name="replace_texture_help" width="300" - word_wrap="true"> + word_wrap="true" + top_delta="0"> Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail to choose a different texture. </text> <check_box height="16" label="Auto scale" layout="topleft" - left="110" + left="107" name="media_auto_scale" - top_pad="0" + top_pad="-10" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." width="200" /> <text @@ -1706,7 +1726,8 @@ Only large parcels can be listed in search. left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - width="100"> + width="100" + top_pad="10"> Size: </text> <spinner @@ -1714,7 +1735,7 @@ Only large parcels can be listed in search. enabled="false" follows="left|top" halign="right" - height="20" + height="23" increment="1" initial_value="0" layout="topleft" @@ -1729,7 +1750,7 @@ Only large parcels can be listed in search. enabled="false" follows="left|top" halign="right" - height="20" + height="23" increment="1" initial_value="0" layout="topleft" @@ -1759,7 +1780,7 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Options:" - top_pad="8" + top_pad="10" width="100"> Options: </text> @@ -1767,10 +1788,10 @@ Only large parcels can be listed in search. height="16" label="Loop" layout="topleft" - left_pad="0" + left_pad="-3" name="media_loop" tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." - top_delta="0" + top_delta="-1" width="200" /> </panel> <panel @@ -1796,12 +1817,12 @@ Only large parcels can be listed in search. </text> <line_editor follows="left|top" - height="20" + height="23" layout="topleft" left="100" max_length="255" name="music_url" - top_pad="0" + top_delta="0" right="-15" select_on_focus="true" /> <text @@ -1917,7 +1938,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 +1948,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 @@ -1941,7 +1962,7 @@ Only large parcels can be listed in search. width="278" /> <check_box enabled="false" - height="22" + height="16" label="Sell passes to:" layout="topleft" left_delta="0" @@ -1950,7 +1971,7 @@ Only large parcels can be listed in search. top_pad="4" width="120" /> <combo_box - height="20" + height="23" layout="topleft" left_pad="22" name="pass_combo" @@ -1968,7 +1989,7 @@ Only large parcels can be listed in search. <spinner enabled="false" follows="left|top" - height="22" + height="23" increment="1" initial_value="10" label="Price in L$:" @@ -1983,7 +2004,7 @@ Only large parcels can be listed in search. <spinner enabled="false" follows="left|top" - height="22" + height="23" increment="0.25" initial_value="1" label="Hours of access:" 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 86229c6691..d202bf1b9f 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="242" + left="217" name="currency_label" width="15"> L$ @@ -123,7 +123,7 @@ label="L$" left_pad="3" name="currency_amt" - width="60"> + width="85"> 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 0dc7d62b19..ddc0d9af72 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -260,10 +260,9 @@ 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" @@ -274,6 +273,7 @@ scratch and wear it. 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 @@ scratch and wear it. left="10" name="Create New" top="104" - width="140" /> + width="160" /> <button follows="right|bottom" height="23" @@ -463,10 +463,9 @@ scratch and wear it. 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" @@ -477,6 +476,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-249" - width="120" /> + width="160" /> <button follows="right|bottom" height="23" @@ -713,10 +713,9 @@ scratch and wear it. 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" @@ -727,6 +726,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-89" - width="120" /> + width="160" /> <button follows="right|bottom" height="23" @@ -898,10 +898,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + 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. </text> <text type="string" @@ -912,6 +911,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="39" - width="120" /> + width="160" /> <button follows="right|bottom" height="23" @@ -1056,7 +1056,7 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -1170,10 +1170,9 @@ scratch and wear it. 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" @@ -1184,6 +1183,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -1376,10 +1376,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + Put on 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" @@ -1390,6 +1389,7 @@ scratch and wear it. 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,10 +1509,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + 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. </text> <text type="string" @@ -1523,6 +1522,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -1715,10 +1715,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + Put on 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" @@ -1729,6 +1728,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -1921,10 +1921,9 @@ scratch and wear it. 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" @@ -1935,6 +1934,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-121" - width="140" /> + width="160" /> <button follows="left|top" height="23" @@ -2139,10 +2139,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + Put on 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" @@ -2153,6 +2152,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="130" /> + width="160" /> <button follows="left|top" height="23" @@ -2345,10 +2345,9 @@ scratch and wear it. 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" @@ -2359,6 +2358,7 @@ scratch and wear it. 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,10 +2551,9 @@ scratch and wear it. left_delta="0" name="not worn instructions" top_pad="8" + word_wrap="true" width="373"> - 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. + Put on 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" @@ -2565,6 +2564,7 @@ scratch and wear it. 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,10 +2757,9 @@ scratch and wear it. 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" @@ -2771,6 +2770,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-41" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -2962,11 +2962,10 @@ scratch and wear it. layout="topleft" left_delta="-2" name="not worn instructions" - top_delta="2" + top_pad="8" + word_wrap="true" 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" @@ -2977,6 +2976,7 @@ scratch and wear it. 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 @@ scratch and wear it. left="8" name="Create New" top="104" - width="120" /> + width="160" /> <button follows="left|top" height="23" @@ -3250,11 +3250,10 @@ scratch and wear it. layout="topleft" left_delta="-2" name="not worn instructions" - top_delta="2" + top_pad="8" + word_wrap="true" 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" @@ -3265,6 +3264,7 @@ scratch and wear it. 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 @@ scratch and wear it. left_delta="0" name="Create New" top_delta="-121" - width="120" /> + width="160" /> <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 b01c0edc8b..0fac6cd5f1 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 92a6111759..a21242ffe1 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_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index ccbba61ddf..d97ca554b7 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -19,6 +19,7 @@ name="im_box_tab_container"
tab_position="bottom"
tab_width="80"
+ tab_height="16"
top="0"
width="390" />
<icon
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 920f0c909a..ae686d9ab7 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="Inspector_Background" - bg_alpha_image="Toast_Background" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_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_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml new file mode 100644 index 0000000000..c3d84de9a7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + border="true" + can_close="false" + can_minimize="false" + height="100" + layout="topleft" + name="modal container" + width="240"> + <button + height="20" + label="Save" + label_selected="Save" + layout="topleft" + left="20" + name="Save" + top="70" + width="82" /> + <button + height="20" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="36" + name="Cancel" + top_delta="0" + width="82" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="20" + name="Save item as:" + top="10" + width="200"> + Save outfit as: + </text> + <line_editor + type="string" + length="1" + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + handle_edit_keys_directly="true" + height="20" + layout="topleft" + left_delta="0" + max_length="63" + name="name ed" + top_pad="4" + width="200"> + [DESC] + </line_editor> +</floater> 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 f1a75bfcb4..aa219b9615 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_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index f44ba6d873..c3e974d978 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -7,7 +7,6 @@ layout="topleft" left="0" name="script_floater" - help_topic="script_floater" top="0" can_dock="true" can_minimize="true" 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 93aa1f0e31..4e89df5a73 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -15,13 +15,12 @@ follows="left|top" height="30" layout="topleft" - left="10" + left="30" name="Save item as:" top="25" word_wrap="true" - width="220"> - Press a key to set your -Speak button trigger. + width="180"> + Press a key to set your Speak button trigger. </text> <button height="23" @@ -30,5 +29,6 @@ Speak button trigger. layout="topleft" right="-10" name="Cancel" + top_pad="8" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index a36a1b591b..60c9810e95 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -43,6 +43,12 @@ layout="topleft" name="local" /> </radio_group> + <ui_ctrl + height="90" + width="90" + name="thumbnail_placeholder" + top_pad="6" + /> <text type="string" font="SansSerifSmall" @@ -54,7 +60,7 @@ left_delta="0" halign="right" name="file_size_label" - top_pad="106" + top_pad="10" width="195"> [SIZE] KB </text> 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 68bb500c78..b06c6dc215 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="550"> + width="800"> <floater.string name="top_scripts_title"> Top Scripts @@ -64,7 +64,7 @@ multi_select="true" name="objects_list" top_delta="17" - width="530"> + width="780"> <scroll_list.columns label="Score" name="score" @@ -84,11 +84,15 @@ <scroll_list.columns label="Time" name="time" - width="100" /> + width="150" /> <scroll_list.columns label="Mono Time" name="mono_time" - width="55" /> + width="100" /> + <scroll_list.columns + label="URLs" + name="URLs" + width="100" /> <scroll_list.commit_callback function="TopObjects.CommitObjectsList" /> </scroll_list> @@ -112,7 +116,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" @@ -144,7 +148,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" @@ -176,7 +180,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="325" /> + width="575" /> <button follows="bottom|right" height="23" @@ -190,7 +194,7 @@ function="TopObjects.GetByOwnerName" /> </button> <button - follows="top|left" + follows="bottom|right" 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 1adb824e2a..5e168fe4aa 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 @@ you must accept the agreement. 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="0" + top_delta="40" 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 b9649e9c57..ae198d69a3 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="270" + height="275" layout="topleft" - min_height="122" + min_height="100" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" @@ -33,27 +33,23 @@ name="no_one_near"> No one near has voice enabled </string> - <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_stack + clip="false" + follows="all" + height="262" layout="topleft" left="10" - name="my_panel" + mouse_opaque="false" + name="my_call_stack" + orientation="vertical" 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" @@ -79,92 +75,57 @@ <output_monitor auto_update="true" draw_border="false" - follows="right" + follows="top|right" height="16" layout="topleft" name="speaking_indicator" - right="-1" - top="2" + left_pad="5" visible="true" width="20" /> - </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> <layout_panel auto_resize="false" - follows="left|right" + user_resize="false" + follows="top|left" height="26" + visible="true" layout="topleft" - mouse_opaque="false" - min_height="24" - min_width="100" name="leave_call_btn_panel" width="100"> <button - follows="left|right" - height="24" + follows="right|top" + height="23" + top_pad="0" label="Leave Call" - left="0" name="leave_call_btn" - top="0" width="100" /> </layout_panel> - <layout_panel - auto_resize="true" - follows="left|right" - height="26" + <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" - 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" /> + multi_select="true" + name="speakers_list" + width="280" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="topleft" + left="0" + name="non_avatar_caller" + top="10" + width="276" /> + </layout_panel> + </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml new file mode 100644 index 0000000000..0221397a8c --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_toast.xml @@ -0,0 +1,19 @@ +<?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_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index 4642e82c0b..d96f3c5494 100644 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -17,7 +17,7 @@ layout="topleft" name="copy_gesture"> <on_click - function="Gesture.Action.CopyPast" + function="Gesture.Action.CopyPaste" parameter="copy_gesture" /> <on_enable function="Gesture.EnableAction" @@ -28,7 +28,7 @@ layout="topleft" name="paste"> <on_click - function="Gesture.Action.CopyPast" + function="Gesture.Action.CopyPaste" parameter="paste" /> <on_enable function="Gesture.EnableAction" @@ -39,7 +39,7 @@ layout="topleft" name="copy_uuid"> <on_click - function="Gesture.Action.CopyPast" + function="Gesture.Action.CopyPaste" parameter="copy_uuid" /> <on_enable function="Gesture.EnableAction" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index fa7e3e86a3..45100eb1ff 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -198,40 +198,6 @@ 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" @@ -283,7 +249,7 @@ </menu_item_call> <menu create_jump_keys="true" - label="About This Place" + label="Place Profile" 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 410c398ea5..957b4d74db 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" @@ -811,6 +811,7 @@ Please select a proposal to view. Please select a history item to view. </notification> +<!-- <notification icon="alertmodal.tga" name="ResetShowNextTimeDialogs" @@ -832,6 +833,7 @@ Would you like to disable all popups which can be skipped? notext="Cancel" yestext="OK"/> </notification> +--> <notification icon="alertmodal.tga" @@ -1597,7 +1599,8 @@ 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" @@ -2917,6 +2920,16 @@ 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? @@ -3553,7 +3566,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 @@ -4543,8 +4556,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> @@ -4693,7 +4706,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 @@ -4974,7 +4987,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 [OBJECTTYPE]: +An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -4996,7 +5009,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you [OBJECTTYPE icon="notify.tga" name="ObjectGiveItemUnknownUser" type="offer"> -An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [OBJECTTYPE]: +An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -5018,7 +5031,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O icon="notify.tga" name="UserGiveItem" type="offer"> -[NAME_SLURL] has given you [OBJECTTYPE]: +[NAME_SLURL] has given you this [OBJECTTYPE]: [ITEM_SLURL] <form name="form"> <button @@ -5181,7 +5194,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O 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" @@ -5357,6 +5370,7 @@ Grant this request? </form> </notification> +<!-- <notification icon="notify.tga" name="FirstBalanceIncrease" @@ -5372,6 +5386,7 @@ Your L$ balance is shown in the upper-right. You just paid L$[AMOUNT]. Your L$ balance is shown in the upper-right. </notification> +--> <notification icon="notify.tga" @@ -5383,6 +5398,8 @@ Your L$ balance will be updated when processing completes. If processing takes m The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard] </notification> + +<!-- <notification icon="notify.tga" name="FirstSit" @@ -5407,8 +5424,9 @@ Use the controls on the right to find things and display different backgrounds. type="notify"> You have opened the Build Tools. Every object you see around you was created using these tools. </notification> +--> -<!-- +<!-- <notification icon="notify.tga" name="FirstLeftClickNoHit" @@ -5417,7 +5435,7 @@ You have opened the Build Tools. Every object you see around you was created usi If the mouse pointer changes to a hand, you can interact with the object. Right-click always shows a menu of things you can do. </notification> ---> + <notification icon="notify.tga" name="FirstTeleport" @@ -5425,6 +5443,8 @@ You have opened the Build Tools. Every object you see around you was created usi You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it. </notification> +--> + <notification icon="notify.tga" name="FirstOverrideKeys" @@ -5435,6 +5455,7 @@ Some objects (like guns) require you to go into mouselook to use them. Press 'M' to do this. </notification> +<!-- <notification icon="notify.tga" name="FirstAppearance" @@ -5454,6 +5475,7 @@ This is your Inventory, which contains items you own. * To rez something inworld, drag it onto the ground. * To read a notecard, double-click it. </notification> +--> <notification icon="notify.tga" @@ -5464,6 +5486,7 @@ This is a sandbox area, and is meant to help Residents learn how to build. Things you build here will be deleted after you leave, so don't forget to right-click and choose 'Take' to move your creation to your Inventory. </notification> +<!-- <notification icon="notify.tga" name="FirstFlexible" @@ -5489,13 +5512,16 @@ To toggle this menu, type="notify"> You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> +--> - <!--notification + <!-- + <notification icon="notify.tga" name="FirstMedia" type="notify"> You have begun playing media. Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust. - </notification--> + </notification> + --> <notification icon="notifytip.tga" 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 6c54532a3a..28a6995186 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="180"> + width="150"> <layout_stack mouse_opaque="false" border_size="0" @@ -16,15 +16,16 @@ name="vertical_stack" orientation="vertical" top="0" - width="177"> + width="147"> <layout_panel auto_resize="true" follows="top|left" height="130" layout="topleft" + left="0" min_height="0" mouse_opaque="false" - width="180" + width="147" top="0" name="speakers_list_panel" user_resize="false"> @@ -39,7 +40,7 @@ show_info_btn="false" show_profile_btn="false" show_speaking_indicator="false" - width="180" /> + width="147" /> </layout_panel> <layout_panel auto_resize="false" @@ -47,7 +48,7 @@ height="25" layout="topleft" min_height="25" - width="160" + width="130" name="call_btn_panel" user_resize="false" visible="false"> @@ -56,7 +57,7 @@ height="20" label="Call" name="call_btn" - width="160" + width="130" top="5" /> </layout_panel> <layout_panel @@ -65,7 +66,7 @@ height="25" layout="topleft" min_height="25" - width="160" + width="130" name="end_call_btn_panel" user_resize="false" visible="false"> @@ -82,7 +83,7 @@ height="25" layout="topleft" min_height="25" - width="160" + width="130" 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 45f9d9c7b6..615ade99a2 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="182" /> + width="180" /> <text follows="right" font="SansSerifSmall" height="15" layout="topleft" - left_pad="8" + left_pad="5" name="last_interaction" text_color="LtGray_50" value="0s" @@ -75,7 +75,7 @@ draw_border="false" height="16" layout="topleft" - left_pad="0" + left_pad="5" mouse_opaque="true" name="speaking_indicator" visible="true" @@ -98,6 +98,7 @@ 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 003e1baa7e..39170b90ca 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 aeaa049f1f..de3de45718 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="4" + min_width="2" left="0" top="0" - width="4" /> + width="2" /> <layout_panel mouse_opaque="false" auto_resize="false" @@ -71,7 +71,7 @@ layout="topleft" left="0" name="talk" - top="4" + top="5" width="100"> <show_button> <show_button.init_callback @@ -103,20 +103,20 @@ min_width="52" name="gesture_panel" user_resize="false"> - <gesture_combo_box + <gesture_combo_list follows="left|right" height="23" label="Gesture" layout="topleft" name="Gesture" left="0" - top="4" + top="5" width="82" tool_tip="Shows/hides gestures"> - <gesture_combo_box.drop_down_button + <gesture_combo_list.combo_button pad_right="10" use_ellipses="true" /> - </gesture_combo_box> + </gesture_combo_list> </layout_panel> <icon auto_resize="false" @@ -153,7 +153,7 @@ layout="topleft" name="movement_btn" tool_tip="Shows/hides movement controls" - top="4" + top="5" width="80"> <button.init_callback function="Button.SetDockableFloaterToggle" @@ -195,7 +195,7 @@ layout="topleft" left="0" tool_tip="Shows/hides camera controls" - top="4" + top="5" name="camera_btn" width="80"> <button.init_callback @@ -235,7 +235,7 @@ layout="topleft" name="snapshots" width="36" - top="4" + top="5" 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="4" + top="5" width="35"> <!-- Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button @@ -362,8 +362,6 @@ 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 @@ -381,9 +379,20 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well top="0" left_pad="3" name="notification_well_panel" - width="35" - min_width="35" + width="40" + min_width="40" user_resize="false"> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> <chiclet_notification flash_period="0.25" follows="right" @@ -392,7 +401,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well left="0" max_displayed_count="99" name="notification_well" - top="4" + top="5" width="35"> <button bottom_pad="3" @@ -405,29 +414,29 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well follows="right" flash_color="ChicletFlashColor" label_color="Black" - left="5" + left="0" name="Unread" image_overlay="Notices_Unread" image_overlay_alignment="center" - pad_right="5" + pad_right="15" tool_tip="Notifications" width="35" > <button.init_callback function="Button.SetDockableFloaterToggle" parameter="notification_well_window" /> </button> - </chiclet_notification> - </layout_panel> - <icon + <icon auto_resize="false" color="0 0 0 0" follows="left|right" height="10" image_name="spacer24.tga" layout="topleft" + left="0" min_width="4" - right="-1" top="0" - width="4"/> + width="5" /> + </chiclet_notification> + </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 5c594d3f14..677bdbc3d2 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -7,6 +7,7 @@ left="0" min_height="350" name="panel_classified_info" + help_topic="profile_classified_info" top="0" width="333"> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 1fbf7abda9..188ded3dab 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -9,6 +9,7 @@ left="0" min_height="350" name="panel_edit_classified" + help_topic="profile_edit_classified" top="0" width="333"> <panel.string 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 d6de5af32d..15eff4b67c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -9,6 +9,7 @@ left="0" min_height="350" name="panel_edit_pick" + help_topic="profile_edit_pick" top="0" width="333"> <button @@ -38,28 +39,27 @@ <scroll_container color="DkGray2" follows="all" - height="510" + height="500" 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" + follows="left|top|right" min_height="300" layout="topleft" top="0" background_visible="false" - height="510" + height="500" left="0" - width="295"> + width="285"> <texture_picker follows="left|top|right" height="197" - width="290" + width="280" layout="topleft" top="20" left="10" @@ -77,7 +77,7 @@ <text type="string" length="1" - follows="left|top" + follows="left|top|right" height="15" font="SansSerifSmall" font.style="BOLD" @@ -86,7 +86,7 @@ top="215" name="Name:" text_color="white" - width="290"> + width="280"> Title: </text> <line_editor @@ -99,11 +99,11 @@ max_length="63" name="pick_name" text_color="black" - width="290" /> + width="280" /> <text type="string" length="1" - follows="left|top" + follows="left|top|right" height="15" font="SansSerifSmall" font.style="BOLD" @@ -112,13 +112,13 @@ top_pad="20" name="description_label" text_color="white" - width="290"> + width="280"> Description: </text> <text_editor follows="left|top|right" height="100" - width="290" + width="280" hide_scrollbar="false" layout="topleft" left="10" @@ -132,27 +132,26 @@ length="1" font="SansSerifSmall" font.style="BOLD" - follows="left|top" + follows="left|top|right" height="15" layout="topleft" left="10" name="location_label" text_color="white" top_pad="20" - width="290"> + width="280"> Location: </text> <text type="string" length="1" - follows="left|top" + follows="left|top|right" height="50" layout="topleft" left="10" name="pick_location" - right="-10" top_pad="2" - width="290" + width="280" 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 be3c0bbd96..172cf18fc4 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -301,14 +301,13 @@ left="10" name="partner_data_panel" width="285"> - <text + <name_box 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 ac731bcdf0..c315adb33e 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 4073ef158b..aa7d621e4c 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="180"> + width="150"> <layout_stack mouse_opaque="false" border_size="0" @@ -16,7 +16,7 @@ name="vertical_stack" orientation="vertical" top="0" - width="175"> + width="145"> <layout_panel auto_resize="true" follows="top|left" @@ -24,7 +24,7 @@ layout="topleft" min_height="0" mouse_opaque="false" - width="180" + width="145" 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="180" /> + width="145" /> </layout_panel> <layout_panel auto_resize="false" @@ -47,7 +47,7 @@ height="28" layout="topleft" min_height="28" - width="160" + width="130" name="group_info_btn_panel" user_resize="false"> <button @@ -57,7 +57,7 @@ name="group_info_btn" use_ellipses="true" top="5" - width="160" /> + width="130" /> </layout_panel> <layout_panel auto_resize="false" @@ -65,7 +65,7 @@ height="28" layout="topleft" min_height="28" - width="160" + width="130" name="call_btn_panel" user_resize="false"> <button @@ -74,7 +74,7 @@ label="Call Group" name="call_btn" use_ellipses="true" - width="160" /> + width="130" /> </layout_panel> <layout_panel auto_resize="false" @@ -82,7 +82,7 @@ height="28" layout="topleft" min_height="28" - width="160" + width="130" name="end_call_btn_panel" user_resize="false" visible="false"> @@ -99,7 +99,7 @@ height="28" layout="topleft" min_height="28" - width="160" + width="130" 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 c0db734f8c..8188048821 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,12 +216,28 @@ 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="100" /> + width="85" /> </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 37578eae70..48083b7677 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 avatars are already in group and were not invited. + Some Residents you chose are already in the group, and so were not sent an invitation. </panel.string> <text type="string" @@ -26,11 +26,10 @@ layout="topleft" left="7" name="help_text" - top="24" + top="28" + word_wrap="true" 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" @@ -48,7 +47,7 @@ Resident Chooser' to start. 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 @@ -57,7 +56,7 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="remove_button" - tool_tip="Removes residents selected above from the invite list" + tool_tip="Removes the Residents selected above from the invite list" top_pad="4" width="200" /> <text @@ -68,6 +67,7 @@ Resident Chooser' to start. 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 5f6b911620..c243d08b97 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,6 +65,7 @@ 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 e096715cee..0d9c2c2162 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -136,6 +136,7 @@ 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 a5bab3232c..6b3fb04549 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -210,6 +210,18 @@ 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" @@ -220,23 +232,32 @@ 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="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> + + <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> </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 e5df37e366..df942b1a26 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -186,6 +186,7 @@ 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_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 9d00abd2c9..4030c7184a 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -41,6 +41,7 @@ halign="center" follows="all" height="295" label="MY INVENTORY" + help_topic="my_inventory_tab" layout="topleft" left="0" name="All Items" @@ -51,6 +52,7 @@ halign="center" follows="all" height="295" label="RECENT" + help_topic="recent_inventory_tab" layout="topleft" left_delta="0" name="Recent Items" 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 5217ab3571..38e8b9844f 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,6 +30,7 @@ (This page does not pass the specified whitelist) </text> <line_editor + max_length="1024" bottom_delta="-24" enabled="true" follows="left|top" @@ -72,13 +73,15 @@ 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 8327edfdd0..27c1af1860 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -28,6 +28,9 @@ name="no_partner_text" value="None" /> <string + name="no_group_text" + value="None" /> + <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> @@ -62,10 +65,11 @@ <panel layout="topleft" follows="left|top|right" + height="505" name="scroll_content_panel" top="0" left="0" - width="303"> + width="297"> <panel follows="left|top|right" height="117" @@ -73,7 +77,7 @@ left="10" name="second_life_image_panel" top="0" - width="300"> + width="297"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -114,7 +118,7 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" - width="188" + width="181" 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. @@ -127,7 +131,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="300"> + width="297"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -167,7 +171,7 @@ textbox.max_length="512" name="fl_description_edit" top_pad="-3" - width="188" + width="181" 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. @@ -260,14 +264,14 @@ name="partner_data_panel" top_pad="0" width="300"> - <text + <name_box 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> @@ -312,7 +316,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 e2884dbedc..9ad99b1f13 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="3" + top="2" width="31" /> <button follows="left|top" @@ -92,7 +92,6 @@ width="20" /> --> </location_input> - <!-- <button --> <!-- follows="right|top" --> <!-- height="20" --> @@ -108,7 +107,6 @@ <!-- 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 f09a0e03ed..2b361c0628 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="1" + top="2" width="283" /> <output_monitor auto_update="true" @@ -45,7 +45,7 @@ follows="right" is_toggle="true" width="20" - top="1" + top="2" 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 73528b28ad..45b64d5e26 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 adf22f825f..8a02637817 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 f68202d287..822e049eec 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -7,6 +7,7 @@ left="0" min_height="350" name="panel_pick_info" + help_topic="profile_pick_info" top="0" width="333"> <button @@ -40,31 +41,30 @@ left="10" top_pad="10" name="profile_scroll" - reserve_scroll_corner="false" width="313"> <panel name="scroll_content_panel" - follows="left|top" + follows="left|top|right" min_height="300" layout="topleft" top="0" background_visible="false" - height="470" + height="400" left="0" - width="295"> + width="285"> <texture_picker enabled="false" - follows="left|top" + follows="left|top|right" height="197" layout="topleft" left="10" name="pick_snapshot" top="20" - width="290" /> + width="280" /> <text follows="left|top|right" height="35" - width="290" + width="280" layout="topleft" font="SansSerifBig" font.style="BOLD" @@ -75,23 +75,29 @@ value="[name]" use_ellipses="true" /> <text - follows="left|top" + follows="left|top|right" height="25" layout="topleft" left="10" name="pick_location" - width="290" + width="280" word_wrap="true" value="[loading...]" /> - <text - follows="left|top|right" - height="280" + <text_editor + bg_readonly_color="DkGray2" + follows="all" + height="100" + width="280" + hide_scrollbar="false" layout="topleft" left="10" + top_pad="2" + max_length="1023" name="pick_desc" - width="290" + read_only="true" + text_readonly_color="white" value="[description]" - word_wrap="true" /> + wrap="true" /> </panel> </scroll_container> <panel diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 1fc553ff36..a2b0adf9d9 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -124,7 +124,6 @@ height="25" top_pad="10" name="buttons_cucks" - help_topic="picks_button_tab" width="313"> <button enabled="false" 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 17651b8caa..1e7acb566f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -2,7 +2,6 @@ <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_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 18d0f8acab..ace8281b4e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -31,7 +31,6 @@ width="300" /> <check_box control_name="ChatOnlineNotification" - enabled="false" height="16" label="When my friends log out or in" 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 c98555735a..22c75a595e 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,16 +270,23 @@ name="title_afk_text" width="190"> Away timeout: - </text> + </text> <color_swatch - control_name="EffectColor" + can_apply_immediately="true" follows="left|top" height="50" layout="topleft" left="50" name="effect_color_swatch" tool_tip="Click to open Color Picker" - width="38" /> + width="38"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="EffectColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="EffectColor" /> + </color_swatch> <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 cc00abf5a0..a0fcf59fc8 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="1" + top_delta="0" width="128"> m </text> @@ -395,7 +395,7 @@ left="216" max_val="8192" name="MaxParticleCount" - top_pad="6" + top_pad="7" width="262" /> <slider control_name="RenderGlowResolutionPow" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 1c1e17eb5a..a8e24366f2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -77,10 +77,23 @@ name="cookies_enabled" top_pad="10" width="350" /> - <check_box + <check_box + control_name="MediaEnabled" + height="16" + label="Media Enabled" + layout="topleft" + left="30" + name="media_enabled" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.MediaEnabled" /> + </check_box> + <check_box + enabled_control="MediaEnabled" control_name="ParcelMediaAutoPlayEnable" height="16" - label="Allow Media Autoplay" + label="Allow Media to auto-play" layout="topleft" left="30" name="autoplay_enabled" 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 075d9232b1..e1d8ee241d 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 @@ -122,6 +122,7 @@ height="22" width="22"> <button + name="fwd_btn" follows="top" image_overlay="Arrow_Right_Off" image_disabled="PushButton_Disabled" @@ -131,7 +132,6 @@ hover_glow_amount="0.15" top="0" height="22" - min_width="22" width="22" layout="topleft" tool_tip="Navigate forward"> @@ -150,10 +150,11 @@ min_width="22" width="22"> <button + name="home_btn" follows="top" + image_overlay="Home_Off" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" - image_overlay="Home_Off" image_selected="PushButton_Selected" image_unselected="PushButton_Off" hover_glow_amount="0.15" @@ -161,7 +162,6 @@ tool_tip="Home page" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Home" /> @@ -178,6 +178,7 @@ min_width="22" width="22"> <button + name="media_stop_btn" follows="top" image_overlay="Stop_Off" image_disabled="PushButton_Disabled" @@ -189,7 +190,6 @@ tool_tip="Stop media" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.MediaStop" /> @@ -206,6 +206,7 @@ min_width="22" width="22"> <button + name="reload_btn" follows="top" image_overlay="Refresh_Off" image_disabled="PushButton_Disabled" @@ -217,7 +218,6 @@ tool_tip="Reload" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Reload" /> @@ -234,6 +234,7 @@ min_width="22" width="22"> <button + name="stop_btn" follows="top" image_overlay="StopReload_Off" image_disabled="PushButton_Disabled" @@ -245,7 +246,6 @@ tool_tip = "Stop loading" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Stop" /> @@ -262,6 +262,7 @@ min_width="22" width="24"> <button + name="play_btn" follows="top" image_overlay="Play_Off" image_disabled="PushButton_Disabled" @@ -274,7 +275,6 @@ left_delta="2" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Play" /> @@ -290,6 +290,7 @@ min_width="22" width="24"> <button + name="pause_btn" follows="top" image_overlay="Pause_Off" image_disabled="PushButton_Disabled" @@ -321,6 +322,7 @@ min_width="90"> <line_editor name="media_address_url" + max_length="1024" follows="top|left|right" height="22" top="0" @@ -353,7 +355,6 @@ image_name="Flag" layout="topleft" tool_tip="White List enabled" - min_width="16" width="16" /> </layout_panel> <layout_panel @@ -368,7 +369,6 @@ image_name="Lock2" layout="topleft" tool_tip="Secured Browsing" - min_width="16" width="16" /> </layout_panel> </layout_stack> @@ -393,7 +393,6 @@ initial_value="0.5" layout="topleft" tool_tip="Movie play progress" - min_width="100" width="200"> <slider_bar.commit_callback function="MediaCtrl.JumpProgress" /> @@ -409,6 +408,7 @@ min_width="22" width="22"> <button + name="skip_back_btn" follows="top" image_overlay="SkipBackward_Off" image_disabled="PushButton_Disabled" @@ -437,6 +437,7 @@ min_width="22" width="22"> <button + name="skip_forward_btn" follows="top" image_overlay="SkipForward_Off" image_disabled="PushButton_Disabled" @@ -448,7 +449,6 @@ layout="topleft" tool_tip="Step forward" top="0" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.SkipForward" /> @@ -469,20 +469,19 @@ <!-- two different images. --> <!-- Note also: the button and the slider must overlap! --> <button + name="media_mute_button" follows="top" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" image_selected="AudioMute_Off" image_unselected="Audio_Off" hover_glow_amount="0.15" - name="media_mute_button" is_toggle="true" layout="topleft" scale_image="false" tool_tip="Mute This Media" top="0" height="20" - min_width="22" width="22" > <button.commit_callback function="MediaCtrl.ToggleMute" /> @@ -522,6 +521,7 @@ min_width="22" width="22"> <button + name="zoom_frame_btn" follows="top" image_overlay="Zoom_Off" image_disabled="PushButton_Disabled" @@ -533,7 +533,6 @@ height="22" layout="topleft" tool_tip="Zoom into media" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Zoom" /> @@ -549,6 +548,7 @@ min_width="21" width="21" > <button + name="close_btn" follows="top" image_overlay="UnZoom_Off" image_disabled="PushButton_Disabled" @@ -576,6 +576,7 @@ min_width="22" width="22"> <button + name="new_window_btn" follows="top" image_overlay="ExternalBrowser_Off" image_disabled="PushButton_Disabled" @@ -587,7 +588,6 @@ layout="topleft" tool_tip = "Open URL in browser" top="0" - min_width="24" width="24" > <button.commit_callback function="MediaCtrl.Open" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 43947262ec..597b6410cd 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -28,6 +28,9 @@ name="no_partner_text" value="None" /> <string + name="no_group_text" + value="None" /> + <string name="RegisterDateFormat"> [REG_DATE] ([AGE]) </string> @@ -62,10 +65,11 @@ <panel layout="topleft" follows="left|top|right" + height="505" name="profile_scroll_panel" top="0" left="0" - width="303"> + width="297"> <panel follows="left|top|right" height="117" @@ -73,7 +77,7 @@ left="10" name="second_life_image_panel" top="0" - width="303"> + width="297"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -117,7 +121,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="303"> + width="297"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -240,14 +244,14 @@ name="partner_data_panel" top_pad="0" width="300"> - <text + <name_box 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> @@ -269,7 +273,7 @@ left="7" name="sl_groups" top_pad="0" - width="298" + width="290" 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. @@ -292,7 +296,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 @@ -311,7 +315,7 @@ label="Call" layout="topleft" name="call" - tool_tip="Call this resident" + tool_tip="Call this Resident" left_pad="3" top="5" width="45" /> @@ -322,7 +326,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" /> @@ -342,7 +346,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" @@ -375,4 +379,4 @@ </layout_panel> </layout_stack> -</panel>
\ No newline at end of file +</panel> 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 ff55090f16..dc8f71c868 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -135,7 +135,8 @@ left="120" name="covenant_help_text" top_pad="10" - width="460"> + word_wrap="true" + width="360"> Changes to the covenant will show on all parcels in the estate. </text> <text @@ -145,9 +146,10 @@ left_delta="0" name="covenant_instructions" top_pad="5" - width="465"> - Drag and drop a notecard to change - the Covenant for this Estate. + word_wrap="true" + font.style="ITALIC" + width="360"> + 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 ba39e88024..3980eb86d3 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" - width="313"> - Changes to settings on this tab will affect all -regions in the estate. + word_wrap="true" + width="275"> + Changes to settings on this tab will affect all regions in the estate. </text> <text type="string" @@ -138,7 +138,7 @@ regions in the estate. 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 @@ regions in the estate. 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 @@ regions in the estate. 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 502a5804c3..04dbf73be9 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" - wrap="true"> + word_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" - wrap="true"> + word_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_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 61f0fa3099..3f836a661d 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -12,13 +12,27 @@ appearance up to tray panel header word like "Home". Embedded panels are inset by a pixel and so their backgrounds will not block the world fully. --> + + <sidetray_tab + name="sidebar_openclose" + help_topic="sidebar_openclose" + tab_title="Toggle Sidebar" + description="Toggle Sidebar." + image="TabIcon_Open_Off" + image_selected="TabIcon_Close_Off" + mouse_opaque="false" + background_visible="true" + > + <panel /> <!-- dummy panel, never to actually be seen --> + </sidetray_tab> + <sidetray_tab name="sidebar_home" help_topic="sidebar_home" tab_title="Home" description="Home." - image="TabIcon_Open_Off" - image_selected="TabIcon_Close_Off" + image="TabIcon_Home_Off" + image_selected="TabIcon_Home_Selected" mouse_opaque="false" background_visible="true" > diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 1dd4eb095c..ab3cc036d5 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -4,7 +4,6 @@ follows="all" height="570" min_height="350" - label="home_tab" help_topic="sidetray_home" layout="topleft" top="0" 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 00f54feabd..bfca2f2e46 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -42,18 +42,36 @@ <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" - right="-128" - label_color="White" + label="Buy L$" + label_color="EmphasisColor" + left_pad="0" label_shadow="false" - name="buycurrency" + name="buyL" pad_right="20px" - tool_tip="My Balance: Click to buy more L$" - top="3" + tool_tip="Click to buy more L$" + top="5" width="100" /> <text type="string" @@ -62,29 +80,27 @@ follows="right|bottom" halign="right" height="16" - top="4" + top="7" 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="16" + height="15" image_selected="AudioMute_Off" image_pressed="Audio_Press" image_unselected="Audio_Off" is_toggle="true" left_pad="18" - top="1" + top="4" 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 new file mode 100644 index 0000000000..60d4a7e00b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -0,0 +1,55 @@ +<?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_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 51974be854..fb5f9d2ec8 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -33,7 +33,6 @@ <panel height="25" layout="bottomright" - help_topic="item_button_tab" name="button_panel" left="5" bottom="5" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 4a992dadd9..e18f59ab64 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -401,7 +401,6 @@ top_pad="10" <panel height="30" layout="bottomright" - help_topic="button_tab" name="button_panel" left="5" bottom="2" @@ -414,4 +413,4 @@ top_pad="10" right="-1" width="100" /> </panel> - </panel>
\ No newline at end of file + </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 d26e855e2f..74f97dca4e 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -153,28 +153,19 @@ layout="topleft" left="5" name="CreatorNameLabel" - top_pad="10" + top_pad="12" 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" + follows="left|right|top" font="SansSerifSmall" height="15" layout="topleft" - left_pad="5" + left_pad="0" name="Creator Name" - top_delta="6" + top_delta="0" width="140"> Erica Linden </text> @@ -186,28 +177,19 @@ layout="topleft" left="5" name="Owner:" - top_pad="10" + top_pad="15" 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" + follows="left|right|top" font="SansSerifSmall" height="15" layout="topleft" - left_pad="5" + left_pad="0" name="Owner Name" - top_delta="6" + top_delta="0" width="140"> Erica Linden </text> @@ -219,7 +201,7 @@ layout="topleft" left="5" name="Group_label" - top_pad="10" + top_pad="15" width="78"> Group: </text> @@ -536,7 +518,6 @@ <panel height="25" layout="bottomright" - help_topic="button_tab" name="button_panel" left="5" bottom="5" @@ -569,4 +550,4 @@ top="0" width="100" /> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f2f23a3847..02dc507781 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 and drop a landmark here to add to your favorites.</string> + <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture"> You do not have a copy of this texture in your inventory @@ -2039,7 +2039,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 --> @@ -2110,7 +2110,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> @@ -2937,7 +2937,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/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 8785dff2ae..f6d1992c8e 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <chat_history - message_header="panel_chat_header.xml" - message_separator="panel_chat_separator.xml" - left_text_pad="10" - right_text_pad="15" - left_widget_pad="0" - right_widget_pad="10" - top_separator_pad="5" - bottom_separator_pad="5" - top_header_pad="17" - bottom_header_pad="10" + message_header="panel_chat_header.xml" + message_separator="panel_chat_separator.xml" + left_text_pad="10" + right_text_pad="15" + left_widget_pad="0" + right_widget_pad="10" + top_separator_pad="2" + bottom_separator_pad="2" + top_header_pad="12" + bottom_header_pad="5" max_length="2147483647" track_bottom="true" name="chat_history" type="string" word_wrap="true" + line_spacing.multiple="1.0" font="SansSerif"> <more_chat_text mouse_opaque="true" word_wrap="true" /> </chat_history> +enabledcontrol
\ No newline at end of file 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 af0d338256..693c43f141 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,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_adhoc - font="SansSerif" height="25" name="im_adhoc_chiclet" show_speaker="false" @@ -12,15 +11,14 @@ 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" @@ -29,13 +27,13 @@ text_color="white" v_pad="5" visible="false" - width="20"/> + width="20" /> <chiclet_im_adhoc.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </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 b1988a2d20..f4fc58701c 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,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_group - font="SansSerif" height="25" name="im_group_chiclet" show_speaker="false" @@ -12,17 +11,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="22" + height="18" + bottom_pad="4" mouse_opaque="true" name="group_icon" - width="22"/> + width="18" /> <chiclet_im_group.unread_notifications height="25" - font="SansSerif" font_halign="center" left="25" mouse_opaque="false" @@ -32,11 +31,11 @@ visible="false" width="20"/> <chiclet_im_group.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> +bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </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 52fbce0de7..535113f717 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,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <chiclet_im_p2p - font="SansSerif" height="25" name="im_p2p_chiclet" show_speaker="false" @@ -18,10 +17,9 @@ 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" @@ -31,11 +29,11 @@ visible="false" width="20"/> <chiclet_im_p2p.new_message_icon - bottom="12" - height="13" - image_name="Unread_Chiclet" - left="12" - name="new_message_icon" - visible="false" - width="13" /> + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> </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 33f85a964c..86bea9be50 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="22" + height="20" mouse_opaque="false" name="chiclet_icon" - width="22"/> + bottom_pad="2" + width="20" /> <chiclet_offer.new_message_icon - bottom="12" - height="13" + bottom="11" + height="14" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="13" /> + width="14" /> </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 560c8e6ea5..b1f9f5b0e8 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="22" - image_name="Generic_Object_Small" + height="20" + image_name="Generic_Object_Small" mouse_opaque="false" name="chiclet_icon" - width="22"/> + width="20" + bottom_pad="2" /> <chiclet_script.new_message_icon - bottom="12" - height="13" + bottom="11" + height="14" image_name="Unread_Chiclet" left="12" name="new_message_icon" visible="false" - width="13" /> + width="14" /> </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 deleted file mode 100644 index 4229f34c09..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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 new file mode 100644 index 0000000000..808683864d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml @@ -0,0 +1,21 @@ +<?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 67bb7c1896..1c0a8ba7c5 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="22" + top="25" left="2" follows="right|top" image_name="Parcel_Damage_Dark" @@ -112,17 +112,19 @@ 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="22" + text_pad_left="27" select_on_focus="false" font="SansSerifSmall" bevel_style="none" border_style="line" - border.border_thickness="0"/> + border.border_thickness="0" /> </location_input> diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 53034afa61..58543338f6 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bg_color="MenuDefaultBgColor" bg_visible="true" - drop_shadow="false" + drop_shadow="true" tear_off="false" shortcut_pad="15"> </menu> |