aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/en-us
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml45
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml60
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml59
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_login.xml149
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml44
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/role_actions.xml8
15 files changed, 209 insertions, 194 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 0b73d9b..f25fd47 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -2,7 +2,7 @@
2<floater can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="440" min_height="100" min_width="100" 3 can_resize="false" height="440" min_height="100" min_width="100"
4 name="floater_about" rect_control="FloaterAboutRect" 4 name="floater_about" rect_control="FloaterAboutRect"
5 title="About Second Life" width="470"> 5 title="About grid viewer" width="470">
6 <tab_container 6 <tab_container
7 follows="all" 7 follows="all"
8 bottom="10" 8 bottom="10"
@@ -30,35 +30,33 @@
30 height="386" 30 height="386"
31 help_topic="about_credits_tab" 31 help_topic="about_credits_tab"
32 name="credits_panel"> 32 name="credits_panel">
33 <text_editor bottom="6" embedded_items="false"
34 follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
35 max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
36 word_wrap="true">
37 The Imprudence Viewer was rocked hard by:
38 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
39 http://kokuaviewer.org/
40 33
41 Imprudence is so awesome thanks to contributions from many generous people: 34 <text_editor bottom="6" embedded_items="false"
35 follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
36 max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
37 word_wrap="true">
38 Meta 7 is brought to you by Laurent, George, Melanie, Shaun, Dave, Kitto, Mike, Brandon, Erich, Daniel, Mark, Trinity, and Tom.
42 39
43 For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar. 40 http://www.meta7.com/
44 41
45 For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden. 42 This viewer is based on the Imprudence viewer.
46 43
47 Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible. 44 The Imprudence Viewer was rocked hard by:
45 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
48 46
49 For a complete list of who did what, read the release notes! 47 http://kokuaviewer.org/
50 48
49 Imprudence is so awesome thanks to contributions from many generous people:
51 50
52 Second Life Copyright (C) 1999-2009 Linden Research Inc. 51 For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
53 52
54 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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others. 53 For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
54
55 Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, meta 7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
56
57 For a complete list of who did what, read the release notes!
55 58
56 Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, 59 Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
57 Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida,
58 Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao,
59 Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi,
60 Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky,
61 Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
62 60
63 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion 61 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
64 APR Copyright (C) 2000-2004 The Apache Software Foundation 62 APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -84,9 +82,7 @@
84 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) 82 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
85 83
86 84
87 Begin, be bold and venture to be wise. -- Horace 85 I live in the future, just waiting for the rest of you to catch up. -- onefang Rejected
88
89 If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou
90 </text_editor> 86 </text_editor>
91 </panel> 87 </panel>
92 </tab_container> 88 </tab_container>
@@ -94,3 +90,4 @@
94 You are at [POSITION] 90 You are at [POSITION]
95 </string> 91 </string>
96</floater> 92</floater>
93
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 453bf46..d57ca5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1420,14 +1420,14 @@ Select the thumbnail to choose a different texture.
1420 </text> 1420 </text>
1421 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" 1421 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
1422 height="16" initial_value="false" 1422 height="16" initial_value="false"
1423 label="Residents who have not given payment info to Linden Lab" 1423 label="Residents who have not given payment info"
1424 left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" 1424 left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false"
1425 tool_tip="Ban unidentified residents." width="278" /> 1425 tool_tip="Ban unidentified residents." width="278" />
1426 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" 1426 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
1427 height="16" initial_value="false" 1427 height="16" initial_value="false"
1428 label="Residents who are not age verified adults" left_delta="0" 1428 label="Residents who are not age verified adults" left_delta="0"
1429 mouse_opaque="true" name="limit_age_verified" radio_style="false" 1429 mouse_opaque="true" name="limit_age_verified" radio_style="false"
1430 tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information." 1430 tool_tip="Ban residents who have not verified their age."
1431 width="278" /> 1431 width="278" />
1432 <string name="estate_override"> 1432 <string name="estate_override">
1433 One or more of these options is set at the estate level 1433 One or more of these options is set at the estate level
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 83d7a5c..67b72e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -106,8 +106,8 @@
106 <combo_item name="MissingContent" value="21"> 106 <combo_item name="MissingContent" value="21">
107 Missing Content 107 Missing Content
108 </combo_item> 108 </combo_item>
109 <combo_item name="LindenDollars(L$)" value="14"> 109 <combo_item name="GridCurrency" value="14">
110 Linden Dollars (L$) 110 Grid currency
111 </combo_item> 111 </combo_item>
112 <combo_item name="Permissions" value="15"> 112 <combo_item name="Permissions" value="15">
113 Permissions 113 Permissions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index daf217e..314ad20 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -154,7 +154,7 @@
154 mouse_opaque="true" name="spin y" 154 mouse_opaque="true" name="spin y"
155 tool_tip="Y coordinate of location to show on map" width="48" /> 155 tool_tip="Y coordinate of location to show on map" width="48" />
156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16" 156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
157 increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0" 157 increment="1" initial_val="0" left_delta="50" max_val="16383" min_val="0"
158 mouse_opaque="true" name="spin z" 158 mouse_opaque="true" name="spin z"
159 tool_tip="Z coordinate of location to show on map" width="48" /> 159 tool_tip="Z coordinate of location to show on map" width="48" />
160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center" 160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index c65a737..87907ec 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -28,7 +28,7 @@
28 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" /> 28 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
29 </menu_item_call> 29 </menu_item_call>
30 <menu_item_separator /> 30 <menu_item_separator />
31 <menu_item_call label="About Imprudence" name="About Imprudence"> 31 <menu_item_call label="About meta-impy" name="About meta-impy">
32 <on_click function="ShowFloater" userdata="about" /> 32 <on_click function="ShowFloater" userdata="about" />
33 </menu_item_call> 33 </menu_item_call>
34 </menu> 34 </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 5fbf337..93ebd1c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -858,8 +858,64 @@
858 <on_click function="ShowFloater" userdata="lag meter" /> 858 <on_click function="ShowFloater" userdata="lag meter" />
859 </menu_item_call> 859 </menu_item_call>
860 <menu_item_separator /> 860 <menu_item_separator />
861 <menu_item_call name="About Imprudence" 861
862 label="About Imprudence"> 862
863 <menu label="meta 7 web site"
864 name="meta 7 web site" opaque="true" tear_off="true" create_jump_keys="true">
865 <menu_item_call hidden="false" label="meta 7 home page..."
866 name="meta 7 home page...">
867 <on_click function="PromptShowURL" name="meta7homePage_url"
868 userdata="WebLaunchExternalTarget,http://www.meta7.com/" />
869 </menu_item_call>
870 <menu_item_call label="Buy M$..." name="Buy M$...">
871 <on_click function="PromptShowURL" name="BuyCredits_url"
872 userdata="WebLaunchExternalTarget,http://www.meta7.com/buycredits.php" />
873 </menu_item_call>
874 <menu_item_call label="Downloads..." name="Downloads...">
875 <on_click function="PromptShowURL" name="Downloads_url"
876 userdata="WebLaunchExternalTarget,http://www.meta7.com/download.php" />
877 </menu_item_call>
878 <menu_item_call label="meta 7 wiki..." name="meta 7 wiki...">
879 <on_click function="PromptShowURL" name="wiki_url"
880 userdata="WebLaunchExternalTarget,http://www.meta7.com//wiki.php?page=wiki" />
881 </menu_item_call>
882 <menu_item_call label="meta 7 IRC (temporary and dodgy)..." name="meta 7 IRC (temporary and dodgy)...">
883 <on_click function="PromptShowURL" name="IRC_url"
884 userdata="WebLaunchExternalTarget,http://webchat.freenode.net/?nick=[IRCNICK]&amp;channels=meta7&amp;btn=25" />
885 </menu_item_call>
886 <menu_item_call label="Official forums..." name="Official forums...">
887 <on_click function="PromptShowURL" name="Forums_url"
888 userdata="WebLaunchExternalTarget,http://forum.meta7.com/" />
889 </menu_item_call>
890 <menu_item_call label="Terms of service..." name="Terms of service...">
891 <on_click function="PromptShowURL" name="TOS_url"
892 userdata="WebLaunchExternalTarget,http://www.meta7.com/wiki.php?page=Terms Of Service" />
893 </menu_item_call>
894 <menu_item_call label="Community standards..." name="Community standards...">
895 <on_click function="PromptShowURL" name="CommunityStandards_url"
896 userdata="WebLaunchExternalTarget,http://www.meta7.com/wiki.php?page=Community+Standards" />
897 </menu_item_call>
898 <menu_item_call label="Maturity ratings..." name="Maturity ratings...">
899 <on_click function="PromptShowURL" name="MaturityRatings_url"
900 userdata="WebLaunchExternalTarget,http://www.meta7.com/wiki.php?page=maturity ratings" />
901 </menu_item_call>
902 <menu_item_call label="Privacy policy..." name="Privacy policy...">
903 <on_click function="PromptShowURL" name="PrivacyPolicy_url"
904 userdata="WebLaunchExternalTarget,http://www.meta7.com/privacy.php" />
905 </menu_item_call>
906 <menu_item_call label="Submit a bug report..." name="Submit a bug report...">
907 <on_click function="PromptShowURL" name="SubmitBugReport_url"
908 userdata="WebLaunchExternalTarget,http://bugs.meta7.com/" />
909 </menu_item_call>
910 <menu_item_call label="Submit a support ticket..." name="Submit a support ticket...">
911 <on_click function="PromptShowURL" name="SubmitTicket_url"
912 userdata="WebLaunchPublicIssue,http://support.meta7.com/" />
913 </menu_item_call>
914 </menu>
915
916
917 <menu_item_call name="About meta-impy"
918 label="About meta-impy">
863 <on_click function="ShowFloater" userdata="about" /> 919 <on_click function="ShowFloater" userdata="about" />
864 </menu_item_call> 920 </menu_item_call>
865 </menu> 921 </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 306e3b8..97a020d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" ?><notifications> 1<?xml version="1.0" ?><notifications>
2 2
3<global name="VIEWER_NAME">Imprudence</global> 3<global name="VIEWER_NAME">meta-impy</global>
4<global name="VIEWER_SITE">kokuaviewer.org</global> 4<global name="VIEWER_SITE">www.meta7.com</global>
5<global name="SECOND_LIFE">Second Life</global> 5<global name="SECOND_LIFE">Second Life</global>
6<global name="SECOND_LIFE_SITE">secondlife.com</global> 6<global name="SECOND_LIFE_SITE">secondlife.com</global>
7 7
@@ -1442,7 +1442,7 @@ Corrupt resource file:
1442 icon="alertmodal.tga" 1442 icon="alertmodal.tga"
1443 name="UnknownResourceFileVersion" 1443 name="UnknownResourceFileVersion"
1444 type="alertmodal"> 1444 type="alertmodal">
1445Unknown Linden resource file version in file: 1445Unknown resource file version in file:
1446 1446
1447[FILE] 1447[FILE]
1448</notification> 1448</notification>
@@ -2877,7 +2877,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
2877 icon="alertmodal.tga" 2877 icon="alertmodal.tga"
2878 name="WebLaunchSupportWiki" 2878 name="WebLaunchSupportWiki"
2879 type="alertmodal"> 2879 type="alertmodal">
2880Go to the Official Linden Blog, for the latest news and information. 2880Go to the grids web site, for the latest news and information.
2881 <usetemplate 2881 <usetemplate
2882 ignoretext="When launching web browser to view the blog" 2882 ignoretext="When launching web browser to view the blog"
2883 name="okcancelignore" 2883 name="okcancelignore"
@@ -3194,30 +3194,11 @@ Type a short announcement which will be sent to everyone currently in your estat
3194 3194
3195<notification 3195<notification
3196 icon="alert.tga" 3196 icon="alert.tga"
3197 label="Change Linden Estate" 3197 label="Pfft some old linden crap"
3198 name="ChangeLindenEstate" 3198 name="PfftLindenCrap"
3199 type="alert"> 3199 type="alert">
3200You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). 3200This used to be some Linden inspired crap, but should never be seen now.
3201 3201Still unravelling the code before I make this go away.
3202This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup.
3203
3204Proceed?
3205 <usetemplate
3206 name="okcancelbuttons"
3207 notext="Cancel"
3208 yestext="OK"/>
3209</notification>
3210
3211<notification
3212 icon="alert.tga"
3213 label="Change Linden Estate Access"
3214 name="ChangeLindenAccess"
3215 type="alert">
3216You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
3217
3218This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
3219
3220It will change thousands of regions and make the spaceserver hiccup.
3221 <usetemplate 3202 <usetemplate
3222 name="okcancelbuttons" 3203 name="okcancelbuttons"
3223 notext="Cancel" 3204 notext="Cancel"
@@ -3686,7 +3667,7 @@ Default: off
3686 label="Max Inventory Items To Transfer" 3667 label="Max Inventory Items To Transfer"
3687 name="HelpMaxInventoryItemsTransfer" 3668 name="HelpMaxInventoryItemsTransfer"
3688 type="alertmodal"> 3669 type="alertmodal">
3689This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42. 3670This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default setting is 42.
3690 3671
3691Default: -1 3672Default: -1
3692</notification> 3673</notification>
@@ -4049,7 +4030,7 @@ Estate managers can only be added or removed by the owner of the estate, not by
4049 label="Use Global Time" 4030 label="Use Global Time"
4050 name="HelpEstateUseGlobalTime" 4031 name="HelpEstateUseGlobalTime"
4051 type="alertmodal"> 4032 type="alertmodal">
4052This checkbox makes the sun in your estate follow the same position as on the Linden-owned &apos;mainland&apos; estates. 4033This checkbox makes the sun in your estate follow the same position as on the grid owned estates.
4053 4034
4054Default: on 4035Default: on
4055</notification> 4036</notification>
@@ -4105,7 +4086,7 @@ Access to this estate will be limited to groups listed here and any Residents ab
4105 type="alertmodal"> 4086 type="alertmodal">
4106Setting this to a valid email address will cause abuse reports on this estate to be sent to that address. 4087Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
4107 4088
4108Setting it blank will cause abuse reports to be sent only to Linden Lab. 4089Setting it blank will cause abuse reports to be sent only to the grid owners.
4109</notification> 4090</notification>
4110 4091
4111<notification 4092<notification
@@ -4437,14 +4418,14 @@ http://secondlife.com/support/incidentreport.php
4437 icon="alertmodal.tga" 4418 icon="alertmodal.tga"
4438 name="HelpReportAbuseEmailEO" 4419 name="HelpReportAbuseEmailEO"
4439 type="alertmodal"> 4420 type="alertmodal">
4440IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab. 4421IMPORTANT: This report will go to the owner of the region you are currently in and not to the grid owners.
4441 4422
4442As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. Linden Lab will not investigate reports you file from this location. 4423As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. The grid owners will not investigate reports you file from this location.
4443 4424
4444The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant. 4425The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
4445(View covenants by going to the World menu and selecting About Land.) 4426(View covenants by going to the World menu and selecting About Land.)
4446 4427
4447The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only Linden Lab can restrict access to the entirety of [GRID_NAME]. --> 4428The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only the grid owners can restrict access to the entirety of [GRID_NAME]. -->
4448</notification> 4429</notification>
4449 4430
4450<notification 4431<notification
@@ -4538,15 +4519,13 @@ Dear Resident,
4538 4519
4539You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly: 4520You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
4540 4521
4541(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world. 4522(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behaviour that violates this grids Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from this grid.
4542 4523
4543(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. 4524(2) The DMCA or Content Removal Process. To request removal of content from this grid, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
4544 4525
4545If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;. 4526If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;.
4546 4527
4547Thank you, 4528Thank you.
4548
4549Linden Lab
4550</notification> 4529</notification>
4551 4530
4552<notification 4531<notification
@@ -5739,9 +5718,9 @@ If you want to view streaming media on parcels that support it you should go to
5739No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. 5718No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable.
5740</notification> 5719</notification>
5741<notification 5720<notification
5742 icon="alertmodal.tga" 5721 icon="alert.tga"
5743 name="MediaPluginFailed" 5722 name="MediaPluginFailed"
5744 type="alertmodal"> 5723 type="alert">
5745The following Media Plugin has failed: 5724The following Media Plugin has failed:
5746[PLUGIN] 5725[PLUGIN]
5747 5726
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index f459e6a..8330624 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -10,7 +10,7 @@
10[AGEVERIFICATION] 10[AGEVERIFICATION]
11 </string> 11 </string>
12 <string name="AcctTypeResident"> 12 <string name="AcctTypeResident">
13 Resident 13 Metazen
14 </string> 14 </string>
15 <string name="AcctTypeTrial"> 15 <string name="AcctTypeTrial">
16 Trial 16 Trial
@@ -19,7 +19,7 @@
19 Charter Member 19 Charter Member
20 </string> 20 </string>
21 <string name="AcctTypeEmployee"> 21 <string name="AcctTypeEmployee">
22 Linden Lab Employee 22 meta 7 staff
23 </string> 23 </string>
24 <string name="PaymentInfoUsed"> 24 <string name="PaymentInfoUsed">
25 Payment Info Used 25 Payment Info Used
@@ -31,10 +31,10 @@
31 No Payment Info On File 31 No Payment Info On File
32 </string> 32 </string>
33 <string name="AgeVerified"> 33 <string name="AgeVerified">
34 Age-verified 34 Adult
35 </string> 35 </string>
36 <string name="NotAgeVerified"> 36 <string name="NotAgeVerified">
37 Not Age-verified 37 Mature
38 </string> 38 </string>
39 <string name="copy_key_info"> 39 <string name="copy_key_info">
40 Copied key for [AVATAR] to clipboard: [KEY] 40 Copied key for [AVATAR] to clipboard: [KEY]
@@ -103,7 +103,7 @@
103 bottom_delta="-25" drop_shadow_visible="true" follows="left|top" 103 bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
104 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12" 104 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
105 mouse_opaque="true" name="partner_label" 105 mouse_opaque="true" name="partner_label"
106 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 106 tool_tip="In world partner."
107 v_pad="0" width="145"> 107 v_pad="0" width="145">
108 Partner: 108 Partner:
109 </text> 109 </text>
@@ -118,7 +118,7 @@
118 border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top" 118 border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
119 font="SansSerifSmall" height="18" is_unicode="false" right="-12" 119 font="SansSerifSmall" height="18" is_unicode="false" right="-12"
120 max_length="254" mouse_opaque="false" name="partner_edit" 120 max_length="254" mouse_opaque="false" name="partner_edit"
121 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 121 tool_tip="In world partner."
122 width="145"> 122 width="145">
123 [FIRST] [LAST] 123 [FIRST] [LAST]
124 </line_editor> 124 </line_editor>
@@ -300,7 +300,7 @@
300 bottom="-20" drop_shadow_visible="true" follows="left|top" 300 bottom="-20" drop_shadow_visible="true" follows="left|top"
301 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 301 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
302 mouse_opaque="true" 302 mouse_opaque="true"
303 name="Tell everyone about your favorite places in Second Life." v_pad="0" 303 name="Tell everyone about your favorite places in world." v_pad="0"
304 width="302"> 304 width="302">
305 Tell everyone about your favorite places. 305 Tell everyone about your favorite places.
306 </text> 306 </text>
@@ -326,7 +326,7 @@
326 bottom="-20" drop_shadow_visible="true" follows="left|top" 326 bottom="-20" drop_shadow_visible="true" follows="left|top"
327 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 327 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
328 mouse_opaque="true" 328 mouse_opaque="true"
329 name="Place an ad in Second Life&apos;s classified listings." v_pad="0" 329 name="Place an ad in the classified listings." v_pad="0"
330 width="302"> 330 width="302">
331 Place an ad in the current grid&apos;s classified listings. 331 Place an ad in the current grid&apos;s classified listings.
332 </text> 332 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index b032b09..0895e3f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -144,8 +144,6 @@ Hover your mouse over the options for more help.
144 Retrieving member data 144 Retrieving member data
145 </string> 145 </string>
146 <string name="confirm_group_create_str"> 146 <string name="confirm_group_create_str">
147 Creating this group will cost [GROUPCREATEFEE]. 147Are you sure you want to spend [GROUPCREATEFEE] to create this group?
148Are you really, really, REALLY sure you want to spend [GROUPCREATEFEE] to create this group?
149Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group&apos;s name will be unavailable for future use.
150 </string> 148 </string>
151</panel> 149</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 68991b6..f43fc7a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -5,7 +5,7 @@
5 follows="left|top|right|bottom" mouse_opaque="true" > 5 follows="left|top|right|bottom" mouse_opaque="true" >
6 6
7 <web_browser name="login_html" 7 <web_browser name="login_html"
8 bottom="102" top="-1" left="0" right="-1" 8 bottom="0" top="-1" left="0" right="-1"
9 border_visible="false" follows="top|left|bottom|right" 9 border_visible="false" follows="top|left|bottom|right"
10 start_url="data:text/html, 10 start_url="data:text/html,
11 %3Chtml%3E 11 %3Chtml%3E
@@ -14,7 +14,7 @@
14 %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E 14 %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E
15 %3Ctr%3E 15 %3Ctr%3E
16 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E 16 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E
17 %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E 17 %3Cimg src=%22meta-impy_loading.png%22 align=%22absmiddle%22%3E
18 %3Cbr/%3E 18 %3Cbr/%3E
19 %3CH1%3Eloading...%3C/H1%3E 19 %3CH1%3Eloading...%3C/H1%3E
20 %3C/td%3E 20 %3C/td%3E
@@ -30,10 +30,36 @@
30 </string> 30 </string>
31 31
32 32
33 <!-- START LOCATION -->
34
35 <text name="start_location_text"
36 bottom="8" left="10" height="16" right="115"
37 follows="left|bottom" h_pad="0" halign="right" v_pad="0"
38 bg_visible="false" drop_shadow_visible="true"
39 border_visible="false" border_drop_shadow_visible="false"
40 font="SansSerifSmall" mouse_opaque="true">
41 Start location:
42 </text>
43 <combo_box name="start_location_combo"
44 bottom_delta="2" left="120" height="16" width="150"
45 follows="left|bottom" font="SansSerifSmall"
46 mouse_opaque="true" allow_text_entry="true" max_chars="128">
47 <combo_item name="MyHome" value="My Home">
48 My Home
49 </combo_item>
50 <combo_item name="MyLastLocation" value="My Last Location">
51 My Last Location
52 </combo_item>
53 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
54 &lt;Type region name&gt;
55 </combo_item>
56 </combo_box>
57
58
33 <!-- FIRST NAME --> 59 <!-- FIRST NAME -->
34 60
35 <text name="first_name_text" 61 <text name="first_name_text"
36 bottom="80" left="24" height="16" width="120" 62 bottom="56" left="24" height="16" width="120"
37 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 63 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
38 bg_visible="false" drop_shadow_visible="true" 64 bg_visible="false" drop_shadow_visible="true"
39 border_visible="false" border_drop_shadow_visible="false" 65 border_visible="false" border_drop_shadow_visible="false"
@@ -70,30 +96,10 @@
70 allow_translate="false" /> 96 allow_translate="false" />
71 97
72 98
73 <!-- SL USERNAME -->
74
75 <text name="username_text"
76 bottom="80" left="24" height="16" width="250"
77 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
78 bg_visible="false" drop_shadow_visible="true"
79 border_visible="false" border_drop_shadow_visible="false"
80 font="SansSerif" mouse_opaque="true">
81 Login name:
82 </text>
83 <line_editor name="username_edit"
84 bottom_delta="-20" left_delta="0" height="20" width="250"
85 follows="left|bottom" font="SansSerif"
86 bevel_style="in" border_style="line" border_thickness="1"
87 max_length="31" mouse_opaque="true"
88 handle_edit_keys_directly="true"
89 select_all_on_focus_received="true"
90 allow_translate="false" />
91
92
93 <!-- PASSWORD --> 99 <!-- PASSWORD -->
94 100
95 <text name="password_text" 101 <text name="password_text"
96 bottom_delta="20" left="285" height="16" width="120" 102 bottom_delta="20" left_delta="130" height="16" width="120"
97 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 103 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
98 bg_visible="false" drop_shadow_visible="true" 104 bg_visible="false" drop_shadow_visible="true"
99 border_visible="false" border_drop_shadow_visible="false" 105 border_visible="false" border_drop_shadow_visible="false"
@@ -108,78 +114,64 @@
108 handle_edit_keys_directly="true" 114 handle_edit_keys_directly="true"
109 select_all_on_focus_received="true" 115 select_all_on_focus_received="true"
110 allow_translate="false" /> 116 allow_translate="false" />
117 <check_box name="remember_check" label="Remember password"
118 bottom_delta="-24" left_delta="0" height="16" width="140"
119 follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
120 initial_value="false" mouse_opaque="true" />
111 121
112 122
113 <!-- GRIDS --> 123 <!-- GRIDS -->
114 124
115 <text name="grid_text" 125 <text name="grid_text"
116 bottom="80" left_delta="150" height="16" width="120" 126 bottom="56" left_delta="150" height="16" width="120"
117 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 127 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
118 bg_visible="false" drop_shadow_visible="true" 128 bg_visible="false" drop_shadow_visible="true"
119 border_visible="false" border_drop_shadow_visible="false" 129 border_visible="false" border_drop_shadow_visible="false"
120 font="SansSerif" mouse_opaque="true"> 130 font="SansSerif" mouse_opaque="true">
121 Grid: 131 Grid:
122 </text> 132 </text>
123 <combo_box name="server_combo" 133 <combo_box name="server_combo"
124 bottom_delta="-20" left_delta="0" height="20" width="120" 134 bottom_delta="-20" left_delta="0" height="20" width="120"
125 follows="left|bottom" allow_text_entry="false" 135 follows="left|bottom" allow_text_entry="false"
126 max_chars="20" mouse_opaque="true" /> 136 max_chars="20" mouse_opaque="true" />
127 137 <button name="grid_btn" label="Grid Manager"
128 138 bottom_delta="-24" left_delta="10" height="16" width="100"
129 <!-- START LOCATION --> 139 follows="left|bottom" font="SansSerifSmall" halign="center"
130 140 mouse_opaque="true" scale_image="TRUE" />
131 <text name="start_location_text"
132 bottom="32" left="10" height="16" right="115"
133 follows="left|bottom" h_pad="0" halign="right" v_pad="0"
134 bg_visible="false" drop_shadow_visible="true"
135 border_visible="false" border_drop_shadow_visible="false"
136 font="SansSerifSmall" mouse_opaque="true">
137 Start location:
138 </text>
139 <combo_box name="start_location_combo"
140 bottom_delta="2" left="120" height="16" width="150"
141 follows="left|bottom" font="SansSerifSmall"
142 mouse_opaque="true" allow_text_entry="true" max_chars="128">
143 <combo_item name="MyHome" value="My Home">
144 My Home
145 </combo_item>
146 <combo_item name="MyLastLocation" value="My Last Location">
147 My Last Location
148 </combo_item>
149 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
150 &lt;Type region name&gt;
151 </combo_item>
152 </combo_box>
153
154
155 <!-- REMEMBER PASSWORD -->
156
157 <check_box name="remember_check" label="Remember password"
158 bottom_delta="-2" left="282" height="16" width="140"
159 follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
160 initial_value="false" mouse_opaque="true" />
161
162
163 <!-- GRID MANAGER -->
164
165 <button name="grid_btn" label="Grid Manager"
166 bottom_delta="0" left="434" height="20" width="100"
167 follows="left|bottom" font="SansSerifSmall" halign="center"
168 mouse_opaque="true" scale_image="TRUE" />
169 141
170 142
171 <!-- LOG IN --> 143 <!-- LOG IN -->
172 144
173 <button name="connect_btn" label="Log In" 145 <button name="connect_btn" label="Log In"
174 bottom="58" left_delta="150" height="24" width="120" 146 bottom="34" left_delta="140" height="24" width="120"
175 follows="left|bottom" font="SansSerif" halign="center" 147 follows="left|bottom" font="SansSerif" halign="center"
176 mouse_opaque="true" scale_image="TRUE" /> 148 mouse_opaque="true" scale_image="TRUE" />
177 149
178 150
151 <!-- SL USERNAME -->
152
153 <text name="username_text"
154 bottom="80" left="24" height="16" width="250"
155 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
156 bg_visible="false" drop_shadow_visible="true"
157 border_visible="false" border_drop_shadow_visible="false"
158 font="SansSerif" mouse_opaque="true">
159 Login name:
160 </text>
161 <line_editor name="username_edit"
162 bottom_delta="-20" left_delta="0" height="20" width="250"
163 follows="left|bottom" font="SansSerif"
164 bevel_style="in" border_style="line" border_thickness="1"
165 max_length="31" mouse_opaque="true"
166 handle_edit_keys_directly="true"
167 select_all_on_focus_received="true"
168 allow_translate="false" />
169
170
179 <!-- ACCOUNT / FORGOT PASSWORD --> 171 <!-- ACCOUNT / FORGOT PASSWORD -->
180 172
181 <text name="create_new_account_text" 173 <text name="create_new_account_text"
182 bottom="69" left="-210" height="16" width="200" 174 bottom="45" left="-210" height="16" width="200"
183 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 175 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
184 bg_visible="false" drop_shadow_visible="true" 176 bg_visible="false" drop_shadow_visible="true"
185 border_visible="false" border_drop_shadow_visible="false" 177 border_visible="false" border_drop_shadow_visible="false"
@@ -189,7 +181,7 @@
189 </text> 181 </text>
190 182
191 <text name="forgot_password_text" 183 <text name="forgot_password_text"
192 bottom="49" left="-210" height="16" width="200" 184 bottom="25" left="-210" height="16" width="200"
193 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 185 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
194 bg_visible="false" drop_shadow_visible="true" 186 bg_visible="false" drop_shadow_visible="true"
195 border_visible="false" border_drop_shadow_visible="false" 187 border_visible="false" border_drop_shadow_visible="false"
@@ -202,7 +194,7 @@
202 <!-- CHANNEL & VERSION --> 194 <!-- CHANNEL & VERSION -->
203 195
204 <text name="channel_text" 196 <text name="channel_text"
205 bottom="29" left="-310" height="16" width="300" 197 bottom="5" left="-310" height="16" width="300"
206 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 198 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
207 bg_visible="false" drop_shadow_visible="true" 199 bg_visible="false" drop_shadow_visible="true"
208 border_visible="false" border_drop_shadow_visible="false" 200 border_visible="false" border_drop_shadow_visible="false"
@@ -210,11 +202,4 @@
210 hover="true" hover_color="50 115 185"> 202 hover="true" hover_color="50 115 185">
211 [CHANNEL] [VERSION] 203 [CHANNEL] [VERSION]
212 </text> 204 </text>
213
214
215 <web_browser name="news_bar"
216 bottom="0" top="20" left="0" right="-1"
217 border_visible="true" follows="left|bottom|right"
218 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
219
220</panel> 205</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 2ed0869..fe19929 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -6,7 +6,7 @@
6 left="470" name="GraphicsPreferencesHelpButton" width="22" /> 6 left="470" name="GraphicsPreferencesHelpButton" width="22" />
7 <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall" 7 <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
8 height="16" initial_value="false" 8 height="16" initial_value="false"
9 label="Run Imprudence in a window" left="10" mouse_opaque="true" 9 label="Run meta-impy in a window" left="10" mouse_opaque="true"
10 name="windowed mode" radio_style="false" width="100" /> 10 name="windowed mode" radio_style="false" width="100" />
11 <check_box bottom_delta="0" enabled="true" follows="left|top" 11 <check_box bottom_delta="0" enabled="true" follows="left|top"
12 font="SansSerifSmall" height="16" initial_value="false" 12 font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 58a2989..4a5c95a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -10,36 +10,36 @@
10 </text> 10 </text>
11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12" 11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
12 name="skin_selection" width="480"> 12 name="skin_selection" width="480">
13 <radio_item bottom="-20" height="20" left="0" name="default" width="480"> 13 <radio_item bottom="-20" height="20" left="0" name="meta7" width="480">
14 Default 14 meta 7
15 </radio_item> 15 </radio_item>
16 <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480"> 16 <radio_item bottom_delta="-50" height="20" left="0" name="white_meta7" width="480">
17 Silver 17 meta 7 white
18 </radio_item> 18 </radio_item>
19 <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480"> 19 <radio_item bottom_delta="-50" height="20" left="0" name="pslpurple" width="480">
20 Dark 20 PSL purple
21 </radio_item> 21 </radio_item>
22 <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480"> 22 <radio_item bottom_delta="-50" height="20" left="0" name="default" width="480">
23 Gemini 23 Classic
24 </radio_item> 24 </radio_item>
25 </radio_group> 25 </radio_group>
26 26
27 <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 27 <button left="130" bottom="-125" width="216" height="95" name="meta7_preview"
28 scale_image="true" label="" image_selected="skin_thumbnail_meta7.png"
29 image_unselected="skin_thumbnail_meta7.png" image_hover_selected="skin_thumbnail_meta7.png"
30 image_hover_unselected="skin_thumbnail_meta7.png" follows="left|top" />
31 <button left="130" bottom_delta="-100" width="216" height="95" name="m7white_preview"
32 scale_image="true" label="" image_selected="skin_thumbnail_white_meta7.png"
33 image_hover_selected="skin_thumbnail_white_meta7.png" image_unselected="skin_thumbnail_white_meta7.png"
34 image_hover_unselected="skin_thumbnail_white_meta7.png" follows="left|top" />
35 <button left="130" bottom_delta="-100" width="216" height="95" name="pslpurple_preview"
36 scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png"
37 image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png"
38 image_hover_unselected="skin_thumbnail_pslpurple.png" follows="left|top" />
39 <button left="130" bottom_delta="-100" width="216" height="95" name="classic_preview"
28 scale_image="true" label="" image_selected="skin_thumbnail_default.png" 40 scale_image="true" label="" image_selected="skin_thumbnail_default.png"
29 image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" 41 image_hover_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png"
30 image_hover_unselected="skin_thumbnail_default.png" follows="left|top" /> 42 image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
31 <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview"
32 scale_image="true" label="" image_selected="skin_thumbnail_silver.png"
33 image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png"
34 image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
35 <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
36 scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
37 image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
38 image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
39 <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview"
40 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png"
41 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png"
42 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
43 <text name="skin_current_text" 43 <text name="skin_current_text"
44 left="10" bottom="5" halign="left" height="12" 44 left="10" bottom="5" halign="left" height="12"
45 follows="left|bottom" h_pad="0" v_pad="0" 45 follows="left|bottom" h_pad="0" v_pad="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 727b142..d855a6f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -9,7 +9,7 @@
9 Use external web browser (Firefox, Safari, Internet Explorer) 9 Use external web browser (Firefox, Safari, Internet Explorer)
10 </radio_item> 10 </radio_item>
11 <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 11 <radio_item bottom="-40" height="20" left="0" name="internal" width="480"
12 tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life."> 12 tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside the viewer.">
13 Use built-in web browser 13 Use built-in web browser
14 </radio_item> 14 </radio_item>
15 </radio_group> 15 </radio_group>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 46ba64a..0169f38 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -101,7 +101,7 @@
101 <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall" 101 <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
102 halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png" 102 halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
103 label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn" 103 label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
104 tool_tip="Search Second Life" width="16" scale_image="false"/> 104 tool_tip="Search the grid" width="16" scale_image="false"/>
105 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 105 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
106 bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall" 106 bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
107 halign="center" height="12" left="-20" mouse_opaque="true" 107 halign="center" height="12" left="-20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bac41bc..1c59430 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -84,7 +84,7 @@
84 longdescription="Change streaming music and movie settings in About Land &gt; Media tab." 84 longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
85 name="land change media" value="20" /> 85 name="land change media" value="20" />
86 <action description="Toggle &apos;Edit Terrain&apos;" 86 <action description="Toggle &apos;Edit Terrain&apos;"
87 longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab." 87 longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move prim plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
88 name="land edit" value="21" /> 88 name="land edit" value="21" />
89 <action description="Toggle various About Land &gt; Options settings" 89 <action description="Toggle various About Land &gt; Options settings"
90 longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab." 90 longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
@@ -126,7 +126,7 @@
126 name="land admin" value="32" /> 126 name="land admin" value="32" />
127 </action_set> 127 </action_set>
128 <action_set 128 <action_set
129 description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." 129 description="These Abilities include powers to allow members to return objects and place and move prim plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
130 name="Parcel Content"> 130 name="Parcel Content">
131 <action description="Return objects owned by group" 131 <action description="Return objects owned by group"
132 longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." 132 longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
@@ -137,8 +137,8 @@
137 <action description="Return non-group objects" 137 <action description="Return non-group objects"
138 longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." 138 longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
139 name="land return non group" value="34" /> 139 name="land return non group" value="34" />
140 <action description="Landscaping using Linden plants" 140 <action description="Landscaping using prim plants"
141 longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button." 141 longdescription="Landscaping ability to place and move prim trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
142 name="land gardening" value="35" /> 142 name="land gardening" value="35" />
143 </action_set> 143 </action_set>
144 <action_set 144 <action_set
generated by cgit v1.1 at 2025-02-05 21:49:07 +0000