diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
412 files changed, 44823 insertions, 21392 deletions
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml new file mode 100644 index 0000000000..e8a705e744 --- /dev/null +++ b/indra/newview/skins/default/xui/en/accordion_drag.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel border_thickness="2" visible ="true" name="splitter_drag" + width="100" + height="5" + left="50" + top="50" + follows="left|bottom|right" background_visible="true" label="splitter_drag" title="" translate="false"> +</panel> diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index 632752b1c4..e17a0dd351 100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> - <panel border_thickness="2" name="splitter_parent" - can_resize="true" background_visible="true" + <panel border_thickness="0" name="splitter_parent" + background_visible="true" label="splitter_parent" title="" + translate="false" > </panel> diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml new file mode 100644 index 0000000000..a60e9afab1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_button.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<button + name="Alert Button" + label_shadow="true" + auto_resize="false" + image_overlay_alignment="center" + use_ellipses="false" + pad_right="10" + pad_left="10" + is_toggle="false" + scale_image="true" + commit_on_return="true" + font="SansSerifSmall" + follows="bottom"/> diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml new file mode 100644 index 0000000000..5535a5dc2a --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_check_box.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<check_box + label_text.text_color="LabelTextColor" + label_text.text_readonly_color="LabelDisabledColor" + font="SansSerif" + follows="left|top" + name="check"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml new file mode 100644 index 0000000000..b0886fce06 --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_icon.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<icon color="1.0 1.0 1.0 1.0" + tab_stop="false" + mouse_opaque="false" + name="icon" + image_name="notify_caution_icon.tga" + follows="left|top"> +</icon> diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml new file mode 100644 index 0000000000..82bf5fc8da --- /dev/null +++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<line_editor + select_on_focus="false" + revert_on_esc="true" + commit_on_focus_lost="true" + ignore_tab="true" + max_length="254" + text_pad_right="0" + text_pad_left="2" + mouse_opaque="true"/> diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml new file mode 100644 index 0000000000..e7dd62eb64 --- /dev/null +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml--> +<!-- All buttons in the Favorites bar will be created from this one --> +<button + follows="left|bottom" + halign="center" + height="15" + image_disabled="transparent.j2c" + image_disabled_selected="transparent.j2c" + image_selected="transparent.j2c" + image_unselected="transparent.j2c" + image_pressed="Favorite_Link_Over" + image_hover_selected="Favorite_Link_Over" + image_hover_unselected="Favorite_Link_Over" + hover_glow_amount="0.15" + label_shadow="false" + layout="topleft" + left="0" + name="favorites_bar_btn" + pad_bottom="1" + pad_left="11" + pad_right="9" + scale_image="true" + tab_stop="false" + bottom="0" + use_ellipses="true" + width="140" /> diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml new file mode 100644 index 0000000000..930bbaa8cb --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_close="true" + can_dock="true" + bevel_style="in" + height="300" + layout="topleft" + name="Test Floater" + save_rect="true" + title="TEST FLOATER" + save_dock_state="true" + save_visibility="true" + single_instance="true" + width="320"> + <string name="nudge_parabuild" translate="false">Nudge 1</string> + <string name="test_the_vlt">This string CHANGE2 is extracted.</string> + <string name="testing_eli">Just a test. changes.</string> + <text_editor + parse_urls="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + border_visible="false" + follows="all" + font="SansSerif" + left="1" + top="20" + layout="topleft" + height="260" + name="chat_history" + max_length="200000" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + translate="false" + track_end="true" + wrap="true" + width="320"> + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + Really long line that is long enough to wrap once with jyg descenders. + </text_editor> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index f52c5d6175..f5365be11f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -1,117 +1,166 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="440" layout="topleft" name="floater_about" + help_topic="floater_about" save_rect="true" - title="About [SECOND_LIFE_VIEWER]" + title="ABOUT [CAPITALIZED_APP_NAME]" width="470"> - <floater.string - name="you_are_at"> - You are at [POSITION] - </floater.string> - <floater.string - name="in_region"> - in [REGION] located at - </floater.string> - <floater.string - name="CPU"> - CPU: - </floater.string> - <floater.string - name="Memory"> - Memory: [MEM] MB - </floater.string> - <floater.string - name="OSVersion"> - OS Version: - </floater.string> - <floater.string - name="GraphicsCardVendor"> - Graphics Card Vendor: - </floater.string> - <floater.string - name="GraphicsCard"> - Graphics Card: - </floater.string> - <floater.string - name="OpenGLVersion"> - OpenGL Version: - </floater.string> - <floater.string - name="LibCurlVersion"> - libcurl Version: - </floater.string> - <floater.string - name="J2CDecoderVersion"> - J2C Decoder Version: - </floater.string> - <floater.string - name="AudioDriverVersion"> - Audio Driver Version: - </floater.string> - <floater.string + <floater.string + name="AboutHeader"> +[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + +</floater.string> + <floater.string + name="AboutCompiler"> +Built with [COMPILER] version [COMPILER_VERSION] + +</floater.string> + <floater.string + name="AboutPosition"> +You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +[SERVER_VERSION] +[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] + +</floater.string> + <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc - + Most PC users who know what these mean will be used to the English versions, + and this info sometimes gets sent to support. --> + <floater.string + name="AboutSystem"> +CPU: [CPU] +Memory: [MEMORY_MB] MB +OS Version: [OS_VERSION] +Graphics Card Vendor: [GRAPHICS_CARD_VENDOR] +Graphics Card: [GRAPHICS_CARD] +</floater.string> + <floater.string + name="AboutDriver"> +Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION] +</floater.string> + <floater.string + name="AboutLibs"> +OpenGL Version: [OPENGL_VERSION] + +libcurl Version: [LIBCURL_VERSION] +J2C Decoder Version: [J2C_VERSION] +Audio Driver Version: [AUDIO_DRIVER_VERSION] +Qt Webkit Version: [QT_WEBKIT_VERSION] +Voice Server Version: [VOICE_VERSION] +</floater.string> + <floater.string name="none"> - (none) - </floater.string> - <floater.string - name="LLMozLibVersion"> - LLMozLib Version: - </floater.string> - <floater.string - name="PacketsLost"> - Packets Lost: [LOST]/[IN] ([PCT]%) - </floater.string> - <text_editor - type="string" - length="1" - follows="left|top|right|bottom" - height="168" - layout="topleft" - left="6" - max_length="65536" - name="credits_editor" - top="266" - width="458" - 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. + (none) + </floater.string> + <floater.string + name="AboutTraffic"> +Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) +</floater.string> + <tab_container + follows="all" + top="25" + left="10" + height="405" + width="450" + name="about_tab" + tab_position="top"> + <panel + border="true" + label="Info" + help_topic="about_support_tab" + name="support_panel"> + <text_editor + parse_urls="true" + follows="top|left" + font="SansSerif" + height="343" + bg_readonly_color="Transparent" + left="5" + max_length="65536" + name="support_editor" + top="5" + width="435" + word_wrap="true" /> + <button + follows="left|top" + label="Copy to Clipboard" + name="copy_btn" + left="10" + top_pad="5" + height="25" + width="180" /> + </panel> + <panel + border="true" + label="Credits" + help_topic="about_credits_tab" + name="credits_panel"> + <text_editor + enabled="false" + follows="left|top" + height="375" + bg_readonly_color="Transparent" + left="5" + text_color="LtGray" + max_length="65536" + name="credits_editor" + top="5" + width="435" + word_wrap="true"> +Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, 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, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, 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, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, 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, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain, and many others. + +Thank you to the following Residents for helping to ensure that this is the best version yet: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan, and many others. - Thank you to the following residents for helping to ensure that this is the best version yet: (in progress) - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion - APR Copyright (C) 2000-2004 The Apache Software Foundation - cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) - DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. - expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. - FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). - GL Copyright (C) 1999-2004 Brian Paul. - Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. - jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) - jpeglib Copyright (C) 1991-1998, Thomas G. Lane. - ogg/vorbis Copyright (C) 2001, Xiphophorus - OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. - SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga - SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - xmlrpc-epi Copyright (C) 2000 Epinions, Inc. - zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. - google-perftools Copyright (c) 2005, Google Inc. - All rights reserved. See licenses.txt for details. - Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) +"The work goes on, the cause endures, the hope still lives, and the dreams shall never die" - Edward Kennedy + </text_editor> + </panel> + <panel + border="true" + label="Licenses" + help_topic="about_licenses_tab" + name="licenses_panel"> + <text_editor + enabled="false" + follows="left|top" + height="375" + bg_readonly_color="Transparent" + left="5" + text_color="LtGray" + max_length="65536" + name="credits_editor" + top="5" + width="435" + word_wrap="true"> +3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion +APR Copyright (C) 2000-2004 The Apache Software Foundation +cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) +DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. +expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. +FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). +GL Copyright (C) 1999-2004 Brian Paul. +google-perftools Copyright (c) 2005, Google Inc. +Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. +jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) +jpeglib Copyright (C) 1991-1998, Thomas G. Lane. +ogg/vorbis Copyright (C) 2001, Xiphophorus +OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. +Pth Copyright (C) 1999-2006 Ralf S. Engelschall <rse@gnu.org> +SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga +SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) +xmlrpc-epi Copyright (C) 2000 Epinions, Inc. +zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. +google-perftools Copyright (c) 2005, Google Inc. +All rights reserved. See licenses.txt for details. - To be a success in business, be daring, be first, be different. --Henry Marchant - </text_editor> - <text_editor - follows="left|top|right|bottom" - font="SansSerif" - height="238" - layout="topleft" - left_delta="0" - max_length="65536" - name="support_editor" - top_delta="-244" - width="458" - word_wrap="true" /> +Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) + </text_editor> + </panel> + </tab_container> </floater> 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 3563780f8b..e6f11cac60 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -4,9 +4,22 @@ height="420" layout="topleft" name="floaterland" + help_topic="floaterland" save_rect="true" - title="About Land" - width="460"> + title="ABOUT LAND" + width="490"> + <floater.string + name="maturity_icon_general"> + "Parcel_PG_Dark" + </floater.string> + <floater.string + name="maturity_icon_moderate"> + "Parcel_M_Dark" + </floater.string> + <floater.string + name="maturity_icon_adult"> + "Parcel_R_Dark" + </floater.string> <floater.string name="Minutes"> [MINUTES] minutes @@ -24,27 +37,28 @@ remaining </floater.string> <tab_container - follows="left|top|right|bottom" - height="400" + follows="all" + height="410" layout="topleft" - left="1" + left="0" name="landtab" tab_position="top" - top="20" - width="459"> + tab_height="25" + tab_min_width="67" + top="10" + width="489"> <panel - border="true" - follows="left|top|right|bottom" - height="380" - label="General" + border="false" + follows="all" + label="GENERAL" layout="topleft" - left="1" + left="0" + help_topic="land_general_tab" name="land_general_panel" - top="-31" - width="458"> + top="0"> <panel.string name="new users only"> - New users only + New Residents only </panel.string> <panel.string name="anyone"> @@ -56,7 +70,7 @@ </panel.string> <panel.string name="area_size_text"> - [AREA] sq.m. + [AREA] m² </panel.string> <panel.string name="auction_id_text"> @@ -72,11 +86,11 @@ </panel.string> <panel.string name="profile_text"> - Profile... + Profile </panel.string> <panel.string name="info_text"> - Info... + Info </panel.string> <panel.string name="public_text"> @@ -93,54 +107,50 @@ <panel.string name="no_selection_text"> No parcel selected. -Go to World menu > About Land or select another parcel to show its details. </panel.string> + <panel.string name="time_stamp_template"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Name:" - top="4" - width="92"> + top="10" + width="100"> Name: </text> <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="16" + follows="left|top" + height="23" layout="topleft" left_pad="2" max_length="63" name="Name" top_delta="0" - width="350" /> + width="365" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Description:" - top="24" width="100"> Description: </text> <text_editor - bevel_style="in" - border_style="line" - border_thickness="1" follows="left|top|right" height="52" layout="topleft" - left_delta="92" + left_pad="2" name="Description" top_delta="0" - width="350" + width="365" word_wrap="true" /> <text type="string" @@ -148,10 +158,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="LandType" - top="84" - width="92"> + top_pad="5" + width="100"> Type: </text> <text @@ -160,7 +170,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="LandTypeText" top_delta="0" width="250"> @@ -172,19 +182,19 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="ContentRating" - top="104" - width="92"> + width="100"> Rating: </text> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" - left_delta="92" + left_pad="2" + valign="center" name="ContentRatingText" top_delta="0" width="250"> @@ -196,10 +206,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Owner:" - top="124" - width="92"> + top_pad="1" + width="100"> Owner: </text> <text @@ -208,98 +218,110 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="OwnerText" - top_delta="0" - width="250"> + width="240"> Leyla Linden </text> - <button + <button + follows="right" + height="23" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> + <!-- <button follows="left|top" - font="SansSerifSmall" - height="16" - label="Profile..." - label_selected="Profile..." + height="23" + label="Profile" layout="topleft" left_pad="4" name="Profile..." - top_delta="0" - width="90" /> + width="90" />--> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Group:" - top="144" - width="92"> + top_pad="7" + width="100"> Group: </text> + <!--TODO: HOOK UP GROUP ICON--> <text enabled="false" follows="left|top" height="16" + left_pad="2" layout="topleft" - left_delta="92" name="GroupText" - top_delta="2" - width="250" /> + width="240"> +Leyla Linden </text> + <button + follows="right" + height="23" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + name="info_btn" + top_delta="-2" + width="16" /> <button follows="left|top" - font="SansSerifSmall" - height="16" - label="Set..." - label_selected="Set..." + height="23" + label="Set" layout="topleft" left_pad="4" + right="-10" name="Set..." - top_delta="-2" - width="90" /> + width="90" + top_delta="-2"/> <check_box enabled="false" height="16" label="Allow Deed to Group" layout="topleft" - left="96" + left="108" name="check deed" - tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation." - top="164" - width="116" /> + tool_tip="A group officer can deed this land to the group, so it will be supported by the group's land allocation." + top_pad="3" + width="146" /> <button enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" - label="Deed..." - label_selected="Deed..." + height="23" + label="Deed" layout="topleft" - left_pad="138" + left_pad="2" + 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" height="16" label="Owner Makes Contribution With Deed" layout="topleft" - left="96" + 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." - top="184" - width="199" /> + width="199" + top_pad="0"/> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="For Sale:" - top="204" - width="92"> + width="100"> For Sale: </text> <text @@ -308,11 +330,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="Not for sale." - top_delta="0" width="186"> - Not for sale. + Not for sale </text> <text type="string" @@ -322,9 +343,8 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="For Sale: Price L$[PRICE]." - top_delta="0" width="226"> - Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.). + Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²) </text> <text enabled="false" @@ -333,18 +353,18 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="SalePending" - top_pad="4" - width="344" /> + top_pad="5" + width="324" /> <button follows="left|top" - height="20" - label="Sell Land..." - label_selected="Sell Land..." + height="23" + label="Sell Land" layout="topleft" - left_delta="199" + left_pad="5" + right="-10" name="Sell Land..." - top_delta="0" - width="145" /> + width="145" + top_delta="-25"/> <text type="string" length="1" @@ -353,7 +373,7 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="-199" name="For sale to" - top_delta="0" + top_delta="20" width="186"> For sale to: [BUYER] </text> @@ -365,9 +385,9 @@ Go to World menu > About Land or select another parcel to show its details. layout="topleft" left_delta="0" name="Sell with landowners objects in parcel." - top_pad="4" + top_pad="-2" width="186"> - Objects included in sale. + Objects included in sale </text> <text type="string" @@ -379,28 +399,29 @@ Go to World menu > About Land or select another parcel to show its details. name="Selling with no objects in parcel." top_delta="0" width="186"> - Objects not included in sale. + Objects not included in sale </text> <button follows="left|top" - height="20" + height="23" label="Cancel Land Sale" label_selected="Cancel Land Sale" layout="topleft" - left="295" + right="-10" name="Cancel Land Sale" - top="228" - width="145" /> + left_pad="5" + top_pad="-25" + width="180" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Claimed:" top="268" - width="92"> + width="100"> Claimed: </text> <text @@ -409,7 +430,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DateClaimText" top_delta="0" width="186"> @@ -421,10 +442,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="PriceLabel" - top="288" - width="92"> + top_pad="5" + width="100"> Area: </text> <text @@ -433,11 +454,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="PriceText" top_delta="0" width="186"> - 4048 sq.m. + 4048 m² </text> <text type="string" @@ -445,10 +466,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Traffic:" top="308" - width="92"> + width="100"> Traffic: </text> <text @@ -457,7 +478,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="92" + left_pad="2" name="DwellText" top_delta="0" width="186"> @@ -466,107 +487,114 @@ Go to World menu > About Land or select another parcel to show its details. <button enabled="false" follows="left|top" - height="20" - label="Buy Land..." - label_selected="Buy Land..." + height="23" + label="Buy Land" layout="topleft" - left="155" + left_delta="52" name="Buy Land..." - top="328" - width="100" /> + top_pad="7" + width="130" /> + <button + enabled="true" + follows="left|top" + height="23" + label="Script Info" + layout="topleft" + left="10" + name="Scripts..." + top_pad="1" + width="150" /> <button enabled="false" follows="left|top" - height="20" - label="Buy For Group..." - label_selected="Buy For Group..." + height="23" + label="Buy For Group" layout="topleft" - left="260" + right="-10" name="Buy For Group..." - top="352" + top_delta="0" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Buy Pass..." - label_selected="Buy Pass..." + height="23" + label="Buy Pass" layout="topleft" - left_delta="-105" + left_delta="-135" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land." top_delta="0" - width="100" /> + width="130" /> <button follows="left|top" - height="20" - label="Abandon Land..." - label_selected="Abandon Land..." + height="23" + label="Abandon Land" layout="topleft" - left="260" + right="-10" name="Abandon Land..." - top="328" + top_pad="-47" width="180" /> <button follows="left|top" - height="20" - label="Reclaim Land..." - label_selected="Reclaim Land..." + height="23" + label="Reclaim Land" layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-48" + top_delta="-61" width="180" /> <button enabled="false" follows="left|top" - height="20" - label="Linden Sale..." - label_selected="Linden Sale..." + height="23" + label="Linden Sale" layout="topleft" left_delta="0" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction." - top_pad="4" + top_pad="2" width="180" /> </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Covenant" + follows="all" + label="COVENANT" layout="topleft" - left_delta="-1" + left="0" + top="0" + help_topic="land_covenant_tab" name="land_covenant_panel" - top_delta="-47" - width="458"> + word_wrap="true"> <panel.string - name="can_resell"> + name="can_resell" + word_wrap="true"> Purchased land in this region may be resold. </panel.string> <panel.string - name="can_not_resell"> + name="can_not_resell" + word_wrap="true"> Purchased land in this region may not be resold. </panel.string> <panel.string - name="can_change"> + name="can_change" + word_wrap="true"> Purchased land in this region may be joined or subdivided. </panel.string> <panel.string - name="can_not_change"> + name="can_not_change" + word_wrap="true"> Purchased land in this region may not be joined or subdivided. </panel.string> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="estate_section_lbl" - top="0" + top="10" width="100"> Estate: </text> @@ -574,38 +602,24 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" - layout="topleft" - left="10" - mouse_opaque="false" - name="estate_name_lbl" - top="20" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" + height="16" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_name_text" top_delta="0" - width="150"> + width="260"> mainland </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="estate_owner_lbl" - top="40" width="100"> Owner: </text> @@ -613,54 +627,51 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" - left_pad="10" + left_pad="0" mouse_opaque="false" name="estate_owner_text" - top_delta="0" - width="150"> + width="300"> (none) </text> <text_editor type="string" length="1" enabled="false" - follows="left|top|right|bottom" - height="115" + follows="all" + height="200" layout="topleft" - left_delta="0" + left="10" max_length="65535" name="covenant_editor" - top_delta="20" - width="330" + width="470" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> <text type="string" length="1" - follows="left|top" - height="20" + follows="right|top" + height="16" + halign="right" layout="topleft" - left_delta="0" + right="-10" + top_pad="0" mouse_opaque="false" name="covenant_timestamp_text" - top_pad="55" - width="250"> + width="460"> Last Modified Wed Dec 31 16:00:00 1969 </text> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="5" + left="10" mouse_opaque="false" name="region_section_lbl" - top="250" width="100"> Region: </text> @@ -668,38 +679,23 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" - layout="topleft" - left="10" - mouse_opaque="false" - name="region_name_lbl" - top="270" - width="100"> - Name: - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_name_text" - top_delta="0" width="150"> - leyla + EricaVille </text> <text type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_landtype_lbl" - top="290" width="100"> Type: </text> @@ -707,12 +703,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="region_landtype_text" - top_delta="0" width="150"> Mainland / Homestead </text> @@ -720,12 +715,11 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="region_maturity_lbl" - top="310" width="100"> Rating: </text> @@ -733,12 +727,13 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" + top_delta="-3" mouse_opaque="false" name="region_maturity_text" - top_delta="0" + valign="center" width="150"> Adult </text> @@ -746,12 +741,12 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left="10" mouse_opaque="false" name="resellable_lbl" - top="330" + top_pad="9" width="100"> Resale: </text> @@ -759,25 +754,24 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="10" mouse_opaque="false" name="resellable_clause" - top_delta="0" - width="330"> + word_wrap="true" + width="360"> Land in this region may not be resold. </text> <text type="string" length="1" follows="left|top" - height="20" + height="30" layout="topleft" left="10" mouse_opaque="false" name="changeable_lbl" - top="350" width="100"> Subdivide: </text> @@ -790,21 +784,20 @@ Go to World menu > About Land or select another parcel to show its details. left_pad="10" mouse_opaque="false" name="changeable_clause" - top_delta="0" + word_wrap="true" width="330"> Land in this region may not be joined/subdivided. </text> </panel> <panel border="true" - follows="left|top|right|bottom" - height="380" - label="Objects" + follows="all" + label="OBJECTS" layout="topleft" - left_delta="0" - name="land_objects_panel" - top_delta="-47" - width="458"> + left="0" + top="0" + help_topic="land_objects_tab" + name="land_objects_panel"> <panel.string name="objects_available_text"> [COUNT] out of [MAX] ([AVAILABLE] available) @@ -819,7 +812,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="parcel_object_bonus" top="4" visible="false" @@ -836,7 +829,7 @@ Go to World menu > About Land or select another parcel to show its details. name="Simulator primitive usage:" top_pad="4" width="364"> - Simulator primitive usage: + Primitive usage: </text> <text type="string" @@ -844,10 +837,10 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="152" + left_delta="190" name="objects_available" top_delta="0" - width="212"> + width="260"> [COUNT] out of [MAX] ([AVAILABLE] available) </text> <text @@ -856,11 +849,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives parcel supports:" top="44" width="152"> - Primitives parcel supports: + Prims parcel supports: </text> <text type="string" @@ -868,7 +861,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="152" + left_delta="190" name="object_contrib_text" top_delta="0" width="212"> @@ -880,11 +873,11 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Primitives on parcel:" top="64" width="152"> - Primitives on parcel: + Prims on parcel: </text> <text type="string" @@ -892,7 +885,7 @@ Go to World menu > About Land or select another parcel to show its details. follows="left|top" height="16" layout="topleft" - left_delta="152" + left_delta="190" name="total_objects_text" top_delta="0" width="48"> @@ -902,21 +895,21 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Owned by parcel owner:" top="84" - width="128"> + width="176"> Owned by parcel owner: </text> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="128" + left_delta="172" name="owner_objects_text" top_delta="0" width="48"> @@ -926,46 +919,45 @@ Go to World menu > About Land or select another parcel to show its details. bottom="100" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOwner" - right="-190" - width="60" /> + right="-140" + width="60" + top_delta="-6"/> <button bottom="100" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" - label="Return..." - label_selected="Return..." + height="23" + label="Return" layout="topleft" name="ReturnOwner..." - right="-60" + 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" - width="128"> + top_pad="5" + width="176"> Set to group: </text> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="128" + left_delta="172" name="group_objects_text" top_delta="0" width="48"> @@ -975,46 +967,45 @@ Go to World menu > About Land or select another parcel to show its details. bottom="120" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" label="Show" + height="23" label_selected="Show" layout="topleft" name="ShowGroup" - right="-190" - width="60" /> + right="-140" + width="60" + top_delta="-6"/> <button bottom="120" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" - label="Return..." - label_selected="Return..." + height="23" + label="Return" layout="topleft" name="ReturnGroup..." - right="-60" + 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" - width="128"> + top_pad="5" + width="176"> Owned by others: </text> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="128" + left_delta="172" name="other_objects_text" top_delta="0" width="48"> @@ -1024,46 +1015,45 @@ Go to World menu > About Land or select another parcel to show its details. bottom="140" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOther" - right="-190" - width="60" /> + right="-140" + width="60" + top_delta="-6"/> <button bottom="140" enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" - label="Return..." - label_selected="Return..." + height="23" + label="Return" layout="topleft" name="ReturnOther..." - right="-60" + 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" - width="128"> + top_pad="5" + width="230"> Selected / sat upon: </text> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="128" + left_delta="220" name="selected_objects_text" top_delta="0" width="48"> @@ -1073,110 +1063,109 @@ Go to World menu > About Land or select another parcel to show its details. type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left="4" + left="10" name="Autoreturn" - top="164" - width="294"> - Autoreturn other residents' objects (minutes, 0 for off): + top_pad="0" + width="412" + wrap="true"> + 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="-100" - width="56" /> + left_pad="0" + width="46" + top_delta="-2"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left="4" + left="10" name="Object Owners:" - top="184" + top_pad="10" width="104"> Object Owners: </text> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Refresh List" - label_selected="Refresh List" - layout="topleft" - left_delta="104" - name="Refresh List" - top_delta="0" - width="106" /> + <button + follows="top|right" + height="23" + image_overlay="Refresh_Off" + layout="topleft" + name="Refresh List" + left_pad="5" + right="-183" + tool_tip="Refresh Object List" + width="20" + top_delta="-6"/> <button enabled="false" follows="left|top" - font="SansSerifSmall" - height="16" - label="Return objects..." - label_selected="Return objects..." + height="23" + label="Return Objects" layout="topleft" left_pad="6" name="Return objects..." top_delta="0" + right="-10" width="164" /> <name_list column_padding="0" draw_heading="true" - follows="left|top|right|bottom" - height="165" + follows="all" + height="180" layout="topleft" - left="4" + left="10" name="owner list" name_column="name" - top="210" - width="450"> + width="470"> <name_list.columns label="Type" name="type" sort_column="online_status" - width="24" /> + width="50" /> <name_list.columns name="online_status" width="-1" /> <name_list.columns - dynamicwidth="true" + dynamic_width="true" label="Name" name="name" /> <name_list.columns label="Count" name="count" - width="70" /> + width="67" /> <name_list.columns label="Most Recent" name="mostrecent" - width="160" /> + width="163" /> </name_list> </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Options" + follows="all" + label="OPTIONS" layout="topleft" - left_delta="0" + help_topic="land_options_tab" name="land_options_panel" - top_delta="31" - width="458"> + left="0" + top="0"> <panel.string name="search_enabled_tooltip"> Let people see this parcel in search results </panel.string> <panel.string name="search_disabled_small_tooltip"> - This option is disabled because this parcel's area is 128 sq.m. or smaller. + This option is disabled because this parcel's area is 128 m² or smaller. Only large parcels can be listed in search. </panel.string> <panel.string @@ -1185,7 +1174,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature"> - Mature Content + Moderate Content </panel.string> <panel.string name="mature_check_adult"> @@ -1193,7 +1182,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_mature_tooltip"> - Your parcel information or content is considered mature. + Your parcel information or content is considered moderate. </panel.string> <panel.string name="mature_check_adult_tooltip"> @@ -1215,13 +1204,14 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" + text_color="white" height="16" layout="topleft" - left="4" + left="10" name="allow_label" - top="4" + top="10" width="278"> - Allow other residents to: + Allow other Residents to: </text> <check_box height="16" @@ -1230,52 +1220,40 @@ Only large parcels can be listed in search. left="14" name="edit land check" tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land." - top="24" - width="268" /> - <check_box - height="16" - label="Create Landmarks" - layout="topleft" - left_delta="0" - name="check landmark" top_pad="4" - width="268" /> + width="147i" /> <check_box height="16" label="Fly" layout="topleft" - left_delta="0" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land." - top_pad="4" - width="268" /> + left_pad="4" + width="150" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label2" - top="24" - width="104"> - Create Objects: + width="150"> + Build: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="edit objects check" - top_delta="0" - width="104" /> + width="130" /> <check_box height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="edit group objects check" - top_delta="0" width="70" /> <text type="string" @@ -1283,25 +1261,24 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label3" - top="44" - width="124"> + width="150"> Object Entry: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="all object entry check" top_delta="0" - width="120" /> + width="130" /> <check_box height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="group object entry check" top_delta="0" width="70" /> @@ -1311,37 +1288,36 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left="178" + left="14" name="allow_label4" - top="64" - width="124"> + width="150"> Run Scripts: </text> <check_box height="16" - label="All Residents" + label="Everyone" layout="topleft" - left_delta="92" + left_pad="2" name="check other scripts" top_delta="0" - width="120" /> + width="130" /> <check_box height="16" label="Group" layout="topleft" - left_delta="100" + left_pad="2" name="check group scripts" top_delta="0" width="70" /> <text type="string" + text_color="white" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="land_options_label" - top="84" width="278"> Land Options: </text> @@ -1352,328 +1328,348 @@ Only large parcels can be listed in search. left="14" name="check safe" tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled." - top="104" - width="268" /> + top_pad="5" + width="200" /> <check_box height="16" label="No Pushing" layout="topleft" - left_delta="164" + left_pad="5" name="PushRestrictCheck" tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land." top_delta="0" width="119" /> <check_box height="16" - label="Show Place in Search (L$30/week) under" + label="Show Place in Search (L$30/week)" layout="topleft" left="14" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results" - top="124" - width="268" /> + width="430" /> <combo_box enabled="false" - height="18" + height="23" layout="topleft" - left_delta="241" + left="30" name="land category with adult" - top_delta="-2" visible="false" - width="130"> + width="140"> <combo_box.item label="Any Category" + name="item0" value="any" /> <combo_box.item label="Linden Location" + name="item1" value="linden" /> <combo_box.item label="Adult" + name="item2" value="adult" /> <combo_box.item label="Arts & Culture" + name="item3" value="arts" /> <combo_box.item label="Business" + name="item4" value="store" /> <combo_box.item label="Educational" + name="item5" value="educational" /> <combo_box.item label="Gaming" + name="item6" value="game" /> <combo_box.item label="Hangout" + name="item7" value="gather" /> <combo_box.item label="Newcomer Friendly" + name="item8" value="newcomer" /> <combo_box.item label="Parks & Nature" + name="item9" value="park" /> <combo_box.item label="Residential" + name="item10" value="home" /> <combo_box.item label="Shopping" + name="item11" value="shopping" /> <combo_box.item label="Other" + name="item12" value="other" /> </combo_box> <combo_box enabled="false" - height="18" + height="23" layout="topleft" - left_delta="0" + left="30" name="land category" - top_delta="0" visible="false" - width="130"> + width="140"> <combo_box.item label="Any Category" + name="item0" value="any" /> <combo_box.item label="Linden Location" + name="item1" value="linden" /> <combo_box.item label="Arts & Culture" + name="item3" value="arts" /> <combo_box.item label="Business" + name="item4" value="store" /> <combo_box.item label="Educational" + name="item5" value="educational" /> <combo_box.item label="Gaming" + name="item6" value="game" /> <combo_box.item label="Hangout" + name="item7" value="gather" /> <combo_box.item label="Newcomer Friendly" + name="item8" value="newcomer" /> <combo_box.item label="Parks & Nature" + name="item9" value="park" /> <combo_box.item label="Residential" + name="item10" value="home" /> <combo_box.item label="Shopping" + name="item11" value="shopping" /> <combo_box.item label="Other" + name="item12" value="other" /> </combo_box> - <button - follows="left|top" - height="18" - label="?" - label_selected="?" - layout="topleft" - left_pad="15" - name="?" - top_delta="0" - width="18" /> <check_box height="16" - label="Mature Content" + label="Moderate Content" layout="topleft" left="14" name="MatureCheck" + top="177" + label_text.valign="center" + label_text.v_pad="-5" tool_tip=" " - top="144" - width="107" /> + width="200" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="10" name="Snapshot:" - top="164" - width="278"> + text_color="white" + top="220" + width="200"> Snapshot: </text> <texture_picker follows="left|top" - height="135" + height="150" layout="topleft" - left_delta="72" + left="14" name="snapshot_ctrl" + fallback_image="default_land_picture.j2c" tool_tip="Click to choose a picture" - top_delta="0" - width="180" /> + width="195" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="4" + left="220" + top="180" + text_color="white" name="landing_point" - top="287" - width="278"> + word_wrap="true" + width="200"> Landing Point: [LANDING] </text> <button - follows="left|top" - font="SansSerifSmall" - height="16" + follows="right|top" + height="23" label="Set" label_selected="Set" layout="topleft" - left_delta="232" name="Set" + right="-68" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar's location inside this parcel." - top_delta="0" width="50" /> <button - follows="left|top" - font="SansSerifSmall" - height="16" + follows="right|top" + height="23" label="Clear" label_selected="Clear" layout="topleft" left_pad="5" name="Clear" - tool_tip="Clear the landing point." - top_delta="0" - width="50" /> + tool_tip="Clear the landing point" + right="-10" + width="55" /> <text type="string" length="1" + text_color="white" follows="left|top" height="16" layout="topleft" - left="4" + left="220" + top_pad="10" name="Teleport Routing: " - top="307" - width="278"> + width="200"> Teleport Routing: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="116" name="landing type" - tool_tip="Teleport Routing -- select how to handle teleports onto your land." - top_delta="0" + top_pad="3" + tool_tip="Teleport Routing -- select how to handle teleports onto your land" width="120"> <combo_box.item enabled="true" label="Blocked" + name="Blocked" value="Blocked" /> <combo_box.item enabled="true" label="Landing Point" + name="LandingPoint" value="Landing Point" /> <combo_box.item enabled="true" label="Anywhere" + name="Anywhere" value="Anywhere" /> </combo_box> </panel> <panel border="true" - follows="left|top|right|bottom" - height="363" - label="Media" + follows="all" + label="MEDIA" layout="topleft" - left_delta="0" - name="land_media_panel" - top_delta="1" - width="458"> + left="0" + top="0" + help_topic="land_media_tab" + name="land_media_panel"> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="with media:" - top="9" - width="65"> - Media Type: + top="10" + width="100"> + Type: </text> <combo_box - height="18" + height="23" layout="topleft" - left_pad="5" + left_pad="0" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" - top_delta="-2" - width="120" /> + width="120" + top_delta="0"/> <text follows="left|top" height="16" layout="topleft" left_pad="10" name="mime_type" - top_delta="2" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" left="10" name="at URL:" - top="29" - width="65"> - Media URL: + width="100" + top_pad="10"> + Home Page: </text> <line_editor - bottom_delta="0" follows="left|top" - height="16" + height="23" layout="topleft" - left="80" + left_pad="0" max_length="255" name="media_url" - right="-80" select_on_focus="true" - text_readonly_color="0.576471 0.662745 0.835294 1" /> + width="300" + top_delta="0"/> <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Set..." - label_selected="Set..." + follows="right|top" + height="23" + label="Set" layout="topleft" - left_pad="8" + left_pad="5" name="set_media_url" - top_delta="0" - width="60" /> + width="70" + top_delta="0"/> + <check_box + follows="top|left" + height="16" + label="Hide URL" + layout="topleft" + left="110" + 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="50" + top_pad="5"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Description:" - top="49" - width="364"> + width="364" + top_pad="10"> Description: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="20" layout="topleft" - left="80" + left="110" max_length="255" name="url_description" - right="-80" select_on_focus="true" - tool_tip="Text displayed next to play/load button" /> + tool_tip="Text displayed next to play/load button" + top_delta="0" + width="300" /> <text type="string" length="1" @@ -1682,10 +1678,10 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Media texture:" - top="69" - width="364"> - Replace -Texture: + top_pad="10" + width="364" + word_wrap="true"> + Replace Texture: </text> <texture_picker allow_no_texture="true" @@ -1693,7 +1689,7 @@ Texture: follows="left|top" height="80" layout="topleft" - left_delta="70" + left="110" name="media texture" tool_tip="Click to choose a picture" top_delta="0" @@ -1702,87 +1698,47 @@ Texture: type="string" length="1" follows="left|top" - height="16" + height="80" layout="topleft" - left_delta="75" + left_pad="8" name="replace_texture_help" - top="85" - width="270"> - (Objects using this texture will show the movie or -web page after you click the play arrow.) - </text> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="Options:" - top="140" - width="292"> - Media -Options: + width="300" + 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_delta="70" + left="107" name="media_auto_scale" + 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." - top_delta="0" - width="200" /> - <check_box - height="16" - label="Loop Media" - layout="topleft" - left_delta="170" - 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" - width="200" /> - <check_box - height="16" - label="Hide Media URL" - layout="topleft" - left="80" - 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." - top="160" - width="200" /> - <check_box - height="16" - label="Hide Music URL" - layout="topleft" - left_delta="170" - name="hide_music_url" - tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information" - top_delta="0" width="200" /> <text type="string" length="1" follows="left|top" - height="16" + height="20" layout="topleft" - left="85" + left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - top="185" - width="85"> - Media size: + width="100" + top_pad="10"> + Size: </text> <spinner decimal_digits="0" enabled="false" follows="left|top" halign="right" - height="16" + height="23" increment="1" initial_value="0" layout="topleft" - left_delta="65" + left_pad="0" max_val="1024" name="media_size_width" tool_tip="Size to render Web media, leave 0 for default." @@ -1793,7 +1749,7 @@ Options: enabled="false" follows="left|top" halign="right" - height="16" + height="23" increment="1" initial_value="0" layout="topleft" @@ -1810,7 +1766,7 @@ Options: follows="left|top" height="16" layout="topleft" - left_delta="70" + left_pad="5" name="pixels" right="-10"> pixels @@ -1822,23 +1778,61 @@ Options: height="16" layout="topleft" left="10" + name="Options:" + top_pad="10" + width="100"> + Options: + </text> + <check_box + height="16" + label="Loop" + layout="topleft" + 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="-1" + width="200" /> + </panel> + <panel + border="true" + follows="all" + label="SOUND" + layout="topleft" + left="0" + top="0" + help_topic="land_audio_tab" + name="land_audio_panel"> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + top="10" name="MusicURL:" - top="225" width="364"> Music URL: </text> <line_editor - border_style="line" - border_thickness="1" - bottom_delta="0" follows="left|top" - height="16" + height="23" layout="topleft" - left="80" + left="100" max_length="255" name="music_url" + top_delta="0" right="-15" select_on_focus="true" /> + <check_box + height="16" + label="Hide URL" + layout="topleft" + name="hide_music_url" + tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information." + left_delta="10" + top_pad="5" + width="292" /> <text type="string" length="1" @@ -1847,28 +1841,17 @@ Options: layout="topleft" left="10" name="Sound:" - top="265" - width="364"> + top_pad="10" + width="100"> Sound: </text> <check_box height="16" label="Restrict gesture and object sounds to this parcel" layout="topleft" - left_delta="70" name="check sound local" - top_delta="0" + left_pad="0" width="292" /> - <button - follows="left|top" - height="18" - label="?" - label_selected="?" - layout="topleft" - left_delta="292" - name="?" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -1878,46 +1861,51 @@ Options: left="10" mouse_opaque="false" name="Voice settings:" - top="305" - width="364"> + top_pad="10" + width="100"> Voice: </text> <check_box - height="54" + height="16" label="Enable Voice" layout="topleft" - left="80" + left_pad="0" name="parcel_enable_voice_channel" - top="267" - width="463" /> + width="300" /> <check_box enabled="false" - height="54" + height="16" label="Enable Voice (established by the Estate)" layout="topleft" - left_delta="0" + left="110" name="parcel_enable_voice_channel_is_estate_disabled" top_delta="0" - width="463" /> + width="300" /> <check_box - height="54" + height="16" label="Restrict Voice to this parcel" layout="topleft" - left="100" - name="parcel_enable_voice_channel_parcel" - top="287" - width="443" /> + left="110" + name="parcel_enable_voice_channel_local" + width="300" /> </panel> <panel border="true" - follows="left|top|right|bottom" - height="333" - label="Access" + follows="all" + label="ACCESS" layout="topleft" - left_delta="0" - name="land_access_panel" - top_delta="31" - width="458"> + left="0" + top="0" + help_topic="land_access_tab" + name="land_access_panel"> + <panel.string + name="access_estate_defined"> + (Defined by the Estate) + </panel.string> + <panel.string + name="allow_public_access"> + Allow Public Access ([MATURITY]) + </panel.string> <panel.string name="estate_override"> One or more of these options is set at the estate level @@ -1926,23 +1914,24 @@ Options: type="string" length="1" follows="left|top" - font="SansSerif" - height="20" + height="16" layout="topleft" - left="8" + left="10" name="Limit access to this parcel to:" - top="4" - width="278"> + text_color="White" + top="10" + width="400"> Access To This Parcel </text> <check_box follows="top|left" height="16" - label="Allow Public Access" layout="topleft" left_delta="0" name="public_access" top_pad="5" + label_text.valign="center" + label_text.v_pad="-7" width="278" /> <text type="string" @@ -1953,27 +1942,27 @@ Options: left_delta="20" name="Only Allow" top="49" - width="278"> - Block Access By: + width="325"> + Restrict Access to Residents verified by: </text> <check_box follows="top|left" height="16" - label="Residents who have not given payment info to Linden Lab" + label="Payment Information on File [ESTATE_PAYMENT_LIMIT]" 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 follows="top|left" height="16" - label="Residents who are not age verified adults" + label="Age Verification [ESTATE_AGE_LIMIT]" layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Ban residents who have not verified their age. See support.secondlife.com 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 @@ -1996,7 +1985,7 @@ Options: top_pad="4" width="120" /> <combo_box - height="16" + height="23" layout="topleft" left_pad="22" name="pass_combo" @@ -2004,15 +1993,17 @@ Options: width="100"> <combo_box.item label="Anyone" + name="Anyone" value="anyone" /> <combo_box.item label="Group" + name="Group" value="group" /> </combo_box> <spinner enabled="false" follows="left|top" - height="16" + height="23" increment="1" initial_value="10" label="Price in L$:" @@ -2022,12 +2013,12 @@ Options: max_val="500" min_val="1" name="PriceSpin" - top="149" - width="180" /> + top_pad="5" + width="200" /> <spinner enabled="false" follows="left|top" - height="16" + height="23" increment="0.25" initial_value="1" label="Hours of access:" @@ -2037,8 +2028,15 @@ Options: max_val="24" min_val="0.01" name="HoursSpin" - top_pad="4" - width="180" /> + top_pad="5" + width="200" /> + <panel + name="Allowed_layout_panel" + follows="top|left" + left="10" + height="170" + top_pad="8" + width="240"> <text type="string" length="1" @@ -2046,46 +2044,48 @@ Options: height="16" label="Always Allow" layout="topleft" - left="20" + left="0" name="AllowedText" - top="204" - width="195"> + top="0" + width="230"> Allowed Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="230" /> <button follows="bottom" - font="SansSerifSmall" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_allowed" - top="308" - width="80" /> + width="100" /> <button follows="bottom" - font="SansSerifSmall" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_allowed" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> + <panel + name="Banned_layout_panel" + follows="top|right" + height="170" + width="240" + left_pad="2"> <text type="string" length="1" @@ -2093,47 +2093,43 @@ Options: height="16" label="Ban" layout="topleft" - left="240" + left="0" name="BanCheck" - top="204" - width="195"> + top="0" + width="200"> Banned Residents </text> <name_list column_padding="0" follows="top|bottom" heading_height="14" - height="80" + height="120" layout="topleft" - left_delta="0" + left="0" multi_select="true" name="BannedList" tool_tip="([LISTED] listed, [MAX] max)" - top_pad="4" - width="195" /> + width="230" /> <button follows="bottom" - font="SansSerifSmall" - height="16" - label="Add..." - label_selected="Add..." + height="23" + label="Add" layout="topleft" - left_delta="5" + left="0" name="add_banned" - top="308" - width="80" /> + width="100" /> <button enabled="false" follows="bottom" - font="SansSerifSmall" - height="16" + height="23" label="Remove" label_selected="Remove" layout="topleft" - left_pad="20" + left_pad="10" name="remove_banned" - top_delta="0" - width="80" /> + right="-1" + width="100" /> + </panel> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml new file mode 100644 index 0000000000..96fe0aa70c --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + name="floater_activeim" + help_topic="floater_activeim" + title="ACTIVE IM" + top="26" + left="0" + height="22" + width="320" + follows="right|bottom" + background_visible="true" + can_close="true" + can_dock="true" + can_minimize="false" + visible="true" + bg_alpha_color="0 0 0 0"> + <scroll_container + follows="top|bottom" + layout="topleft" + top="20" + left="1" + width="320" + height="2" + name="panel_list_container"> + <scrolling_panel_list + follows="left|right" + layout="topleft" + left="1" + name="chiclet_row_panel_list" + width="318"/> + </scroll_container> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 59d0d45425..cb6b2f6ebc 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" - height="556" + height="610" layout="topleft" name="Animation Preview" - width="300"> + help_topic="animation_preview" + width="280"> <floater.string name="failed_to_initialize"> Failed to initialize motion @@ -145,331 +147,427 @@ Maximum animation length is [MAX_LENGTH] seconds. name="E_ST_NO_XLT_EMOTE"> Cannot read emote name. </floater.string> - <text + <floater.string + name="E_ST_BAD_ROOT"> + Incorrect root joint name, use "hip". + </floater.string> + <text type="string" length="1" bottom="42" follows="top|left" - height="15" + height="23" layout="topleft" left="10" name="name_label"> Name: </text> <line_editor - bottom_delta="2" + bottom_delta="0" follows="top|left|right" - height="19" + height="23" layout="topleft" - left="85" + left="100" name="name_form" right="-10" /> <text type="string" length="1" - bottom_delta="22" + top_pad="5" follows="top|left" - height="15" + height="23" layout="topleft" left="10" name="description_label"> Description: </text> <line_editor - bottom_delta="2" + bottom_delta="0" follows="top|left|right" - height="19" + height="23" layout="topleft" - left="85" + left="100" name="description_form" right="-10" /> <spinner decimal_digits="0" follows="left|top" - height="18" + height="23" increment="1" initial_value="0" label="Priority" - label_width="50" + label_width="88" layout="topleft" left="10" max_val="4" name="priority" - tool_tip="Controls which other animations can be overridden by this animation." - width="90" /> + tool_tip="Controls which other animations can be overridden by this animation" + width="160" /> <check_box - bottom_delta="23" - height="18" + top_pad="0" + height="14" label="Loop" layout="topleft" left="10" + width="100" name="loop_check" - tool_tip="Makes this animation loop." /> + tool_tip="Makes this animation loop" /> <spinner follows="left|top" - height="18" + height="23" increment="1" initial_value="0" label="In(%)" - label_width="30" + label_width="70" layout="topleft" - left_delta="70" + top_pad="5" + left="15" max_val="100" name="loop_in_point" - tool_tip="Sets point in animation that looping returns to." - top_delta="2" - width="90" /> + tool_tip="Sets point in animation that looping returns to" + width="130" /> <spinner bottom_delta="0" follows="left|top" - height="18" + height="23" increment="1" initial_value="0" label="Out(%)" layout="topleft" - left="185" + left_pad="10" max_val="100" name="loop_out_point" - tool_tip="Sets point in animation that ends a loop." /> + tool_tip="Sets point in animation that ends a loop" + label_width="60" + width="120" /> <text type="string" length="1" - bottom_delta="20" + top_pad="0" follows="top|left" - height="15" + height="23" + width="110" + word_wrap="true" layout="topleft" left="10" name="hand_label"> Hand Pose </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="76" + left_pad="20" name="hand_pose_combo" - tool_tip="Controls what hands do during animation." - top_delta="-1" - width="104"> + tool_tip="Controls what hands do during animation" + width="130"> <combo_box.item label="Spread" + name="Spread" value="" /> <combo_box.item label="Relaxed" + name="Relaxed" value="Hands_Relaxed" /> <combo_box.item label="Point Both" + name="PointBoth" value="Hands_Point" /> <combo_box.item label="Fist" + name="Fist" value="Hands_Fist" /> <combo_box.item label="Relaxed Left" + name="RelaxedLeft" value="Hands_Relaxed_L" /> <combo_box.item label="Point Left" + name="PointLeft" value="Hands_Point_L" /> <combo_box.item label="Fist Left" + name="FistLeft" value="Hands_Fist_L" /> <combo_box.item label="Relaxed Right" + name="RelaxedRight" value="Hands_Relaxed_R" /> <combo_box.item label="Point Right" + name="PointRight" value="Hands_Point_R" /> <combo_box.item label="Fist Right" + name="FistRight" value="Hands_Fist_R" /> <combo_box.item label="Salute Right" + name="SaluteRight" value="Hands_Salute_R" /> <combo_box.item label="Typing" + name="Typing" value="Hands_Typing" /> <combo_box.item label="Peace Right" + name="PeaceRight" value="Hands_Peace_R" /> </combo_box> <text type="string" length="1" - bottom_delta="22" + top_pad="5" follows="top|left" - height="15" + height="23" + width="110" + word_wrap="true" layout="topleft" left="10" name="emote_label"> Expression </text> <combo_box - height="18" + height="23" + width="130" layout="topleft" - left_delta="76" + left_pad="20" name="emote_combo" - tool_tip="Controls what face does during animation." - top_delta="-1" - width="104"> - <combo_box.item - label="None]" /> - <combo_box.item - label="Aaaaah" /> - <combo_box.item - label="Afraid" /> - <combo_box.item - label="Angry" /> - <combo_box.item - label="Big Smile" /> - <combo_box.item - label="Bored" /> - <combo_box.item - label="Cry" /> - <combo_box.item - label="Disdain" /> - <combo_box.item - label="Embarrassed" /> - <combo_box.item - label="Frown" /> - <combo_box.item - label="Kiss" /> - <combo_box.item - label="Laugh" /> - <combo_box.item - label="Plllppt" /> - <combo_box.item - label="Repulsed" /> - <combo_box.item - label="Sad" /> - <combo_box.item - label="Shrug" /> - <combo_box.item - label="Smile" /> - <combo_box.item - label="Surprise" /> - <combo_box.item - label="Wink" /> - <combo_box.item - label="Worry" /> + tool_tip="Controls what face does during animation"> + <item + label="(None)" + value="" + name="[None]" /> + <item + label="Aaaaah" + value="Aaaaah" + name="Aaaaah" /> + <item + label="Afraid" + value="Afraid" + name="Afraid" /> + <item + label="Angry" + value="Angry" + name="Angry" /> + <item + label="Big Smile" + value="Big Smile" + name="BigSmile" /> + <item + label="Bored" + value="Bored" + name="Bored" /> + <item + label="Cry" + value="Cry" + name="Cry" /> + <item + label="Disdain" + value="Disdain" + name="Disdain" /> + <item + label="Embarrassed" + value="Embarrassed" + name="Embarrassed" /> + <item + label="Frown" + value="Frown" + name="Frown" /> + <item + label="Kiss" + value="Kiss" + name="Kiss" /> + <item + label="Laugh" + value="Laugh" + name="Laugh" /> + <item + label="Plllppt" + value="Plllppt" + name="Plllppt" /> + <item + label="Repulsed" + value="Repulsed" + name="Repulsed" /> + <item + label="Sad" + value="Sad" + name="Sad" /> + <item + label="Shrug" + value="Shrug" + name="Shrug" /> + <item + label="Smile" + value="Smile" + name="Smile" /> + <item + label="Surprise" + value="Surprise" + name="Surprise" /> + <item + label="Wink" + value="Wink" + name="Wink" /> + <item + label="Worry" + value="Worry" + name="Worry" /> </combo_box> <text type="string" length="1" + top_pad="5" follows="top|left" - height="15" + height="23" + width="110" + word_wrap="true" layout="topleft" left="10" - name="preview_label" - top="167" - width="70"> + name="preview_label"> Preview while </text> <combo_box - height="18" + height="23" + width="130" layout="topleft" - left_pad="6" + left_pad="20" name="preview_base_anim" - tool_tip="Use this to test your animation behavior while your avatar performs common actions." - top_delta="-1" - width="104"> - <combo_box.item - label="Standing" /> - <combo_box.item - label="Walking" /> - <combo_box.item - label="Sitting" /> - <combo_box.item - label="Flying" /> + tool_tip="Use this to test your animation behavior while your avatar performs common actions."> + <item + label="Standing" + value="Standing" + name="Standing" /> + <item + label="Walking" + value="Walking" + name="Walking" /> + <item + label="Sitting" + value="Sitting" + name="Sitting" /> + <item + label="Flying" + value="Flying" + name="Flying" /> </combo_box> <spinner follows="left|top" - height="18" + height="23" increment="0.01" initial_value="0" label="Ease In (sec)" - label_width="65" + label_width="140" layout="topleft" left="10" max_val="10" name="ease_in_time" - tool_tip="Amount of time (in seconds) over which animations blends in." - top="191" - width="125" /> + tool_tip="Amount of time (in seconds) over which animations blends in" + top_pad="10" + width="210" /> <spinner follows="left|top" - height="18" + height="23" increment="0.01" initial_value="0" label="Ease Out (sec)" - label_width="75" + label_width="140" layout="topleft" - left_pad="15" + top_pad="0" max_val="10" name="ease_out_time" - tool_tip="Amount of time (in seconds) over which animations blends out." - top_delta="0" - width="135" /> + tool_tip="Amount of time (in seconds) over which animations blends out" + width="210" /> <button follows="top|right" - height="28" - image_selected="button_anim_play_selected.tga" - image_unselected="button_anim_play.tga" + height="23" + image_overlay="Play_Over" + image_unselected="SegmentedBtn_Left_Off" + image_selected="SegmentedBtn_Left_On_Selected" + image_disabled_selected="SegmentedBtn_Left_Selected_Disabled" + image_disabled="SegmentedBtn_Left_Disabled" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" layout="topleft" left="10" name="play_btn" - picture_style="true" - tool_tip="Play/pause your animation." - top="223" - width="28" /> + tool_tip="Play your animation" + top_pad="0" + width="23" /> <button + visible = "false" follows="top|right" - height="28" - image_selected="button_anim_stop_selected.tga" - image_unselected="button_anim_stop.tga" + height="23" + image_overlay="Pause_Over" + image_unselected="SegmentedBtn_Left_Off" + image_selected="SegmentedBtn_Left_On_Selected" + image_disabled_selected="SegmentedBtn_Left_Selected_Disabled" + image_disabled="SegmentedBtn_Left_Disabled" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" + layout="topleft" + left="10" + name="pause_btn" + tool_tip="Pause your animation" + top_pad="-23" + width="23" /> + <button + follows="top|right" + height="23" + image_overlay="StopReload_Over" + image_unselected="SegmentedBtn_Right_Off" + image_selected="SegmentedBtn_Right_On_Selected" + image_disabled_selected="SegmentedBtn_Right_Selected_Disabled" + image_disabled="SegmentedBtn_Right_Disabled" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" layout="topleft" - left_pad="4" name="stop_btn" - picture_style="true" tool_tip="Stop animation playback" top_delta="0" - width="28" /> + left_delta="23" + width="23" /> <slider - bottom_delta="0" + left_pad="10" follows="top|right" - height="20" + height="23" + width="200" increment="0.0001" initial_value="0" layout="topleft" - left="80" name="playback_slider" - right="290" show_text="false" /> <text type="string" length="1" - bottom="306" + height="72" + word_wrap="true" + top_pad="5" + text_color="EmphasisColor" follows="top|left" layout="topleft" - left="10" + left="70" name="bad_animation_text"> Unable to read animation file. We recommend BVH files exported from Poser 4. </text> <button - bottom="546" - follows="bottom|right" - height="20" - label="Cancel" - layout="topleft" - name="cancel_btn" - right="290" - width="123" /> - <button + top="580" follows="bottom|left" - height="20" + height="23" label="Upload (L$[AMOUNT])" layout="topleft" - left_delta="-129" + left="10" name="ok_btn" - top_delta="0" - width="123" /> + width="128" /> + <button + top="580" + follows="bottom|left" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + left="142" + width="128" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 21d060fdda..9c6d114c4c 100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - height="368" + height="412" layout="topleft" - min_height="368" + min_height="412" min_width="420" name="floater_auction" - title="Start Linden Land Sale" + help_topic="floater_auction" + title="START LINDEN LAND SALE" width="420"> <floater.string name="already for sale"> @@ -29,6 +31,7 @@ top_pad="12" width="400" /> <check_box + control_name="AuctionShowFence" follows="left|bottom" height="16" initial_value="true" @@ -47,15 +50,47 @@ left_delta="0" name="snapshot_btn" top_pad="4" - width="96" /> + width="150"> + <button.commit_callback + function="ClickSnapshot" /> + </button> <button follows="left|bottom" height="20" - label="OK" - label_selected="OK" + label="Sell to Anyone" + label_selected="Sell to Anyone" + layout="topleft" + left_delta="0" + name="sell_to_anyone_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickSellToAnyone" /> + </button> + <button + follows="left|bottom" + height="20" + label="Clear Settings" + label_selected="Clear Settings" + layout="topleft" + left_delta="0" + name="reset_parcel_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickResetParcel" /> + </button> + <button + follows="left|bottom" + height="20" + label="Start Auction" + label_selected="Start Auction" layout="topleft" left_pad="4" - name="ok_btn" + name="start_auction_btn" top_delta="0" - width="48" /> + width="150"> + <button.commit_callback + function="ClickStartAuction" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index 0e29046500..f59badfcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="350" layout="topleft" min_height="200" min_width="265" name="avatarpicker" - title="Choose Resident" + help_topic="avatarpicker" + title="CHOOSE RESIDENT" width="265"> <floater.string name="not_found"> @@ -14,7 +16,7 @@ </floater.string> <floater.string name="no_one_near"> - No-one near + No one near </floater.string> <floater.string name="no_results"> @@ -24,25 +26,31 @@ name="searching"> Searching... </floater.string> + <!-- For multiple person selection, use "Select" and "Close" + instead of "OK" and "Cancel" because "Cancel" still keeps the ones + you have already selected. The code will show the appropriate + set of buttons. --> + <string name="Select">Select</string> + <string name="Close">Close</string> <tab_container - follows="left|right|top|bottom" + follows="all" height="300" layout="topleft" - left="4" + left="0" name="ResidentChooserTabs" tab_position="top" - tab_width="65" top="20" - width="255"> + width="265"> <panel - border="true" + border="none" height="150" label="Search" layout="topleft" left="6" + help_topic="avatarpicker" name="SearchPanel" top="150" - width="134"> + width="132"> <text type="string" length="1" @@ -53,46 +61,47 @@ name="InstructSearchResidentName" top="8" width="220"> - Type part of the resident's name: + Type part of a person's name: </text> <line_editor - border_style="line" - border_thickness="1" + bevel_style="none" + border_style="line" + border.border_thickness="0" + commit_on_focus_lost="false" follows="left|top|right" - height="16" - layout="topleft" + height="23" left_delta="0" name="Edit" - top_pad="4" - width="132" /> + top_pad="0" + width="65" /> <button follows="top|right" - height="20" - label="Find" - label_selected="Find" + height="23" + label="Go" + label_selected="Go" layout="topleft" - left_pad="30" + left_pad="5" name="Find" - top_delta="-1" - width="95" /> + width="45" /> <scroll_list - follows="left|top|right|bottom" - height="90" + follows="all" + height="98" layout="topleft" - left="10" + left="0" name="SearchResults" top="52" - width="115" /> + width="132" /> </panel> <panel - border="true" + border="none" height="150" - label="Calling Cards" + label="Friends" layout="topleft" - left_delta="-1" - name="CallingCardsPanel" - top_delta="134" - width="135"> + left="6" + help_topic="avatarpicker" + name="FriendsPanel" + top="150" + width="132"> <text type="string" length="1" @@ -100,31 +109,45 @@ height="16" layout="topleft" left="10" - name="InstructSelectCallingCard" - top="8" - width="220"> - Select a calling card: + name="InstructSelectFriend" + top="5" + width="200"> + Select a person: </text> - <inventory_panel - allow_multi_select="false" - border="true" - follows="left|top|right|bottom" - height="110" + <button + follows="top|right" layout="topleft" - left_delta="0" - name="InventoryPanel" - top_pad="7" - width="115" /> + right="-5" + top ="5" + height="20" + width="20" + name="RefreshFriends" + image_overlay="Refresh_Off"> + <button.commit_callback + function="Refresh.FriendList"/> + </button> + <scroll_list + follows="all" + height="100" + border="false" + layout="topleft" + left="0" + name="Friends" + sort_column="0" + top_pad="5" + width="132" /> </panel> + <panel - border="true" - height="240" + border="none" + height="150" label="Near Me" layout="topleft" left="6" + help_topic="avatarpicker" name="NearMePanel" - top="60" - width="135"> + top="150" + width="132"> <text type="string" length="1" @@ -135,74 +158,69 @@ name="InstructSelectResident" top="8" width="220"> - Select nearby resident: + Select a person nearby: </text> - <button - follows="top|right" - height="20" - label="Refresh List" - label_selected="Refresh List" - layout="topleft" - left_delta="25" - name="Refresh" - top_delta="-1" - width="90" /> <slider control_name="NearMeRange" decimal_digits="0" follows="left|top" - height="15" + height="18" increment="1" initial_value="20" label="Range" layout="topleft" left="10" - max_val="40" + max_val="130" min_val="5" name="near_me_range" - top="32" - width="175" /> + top_pad="0" + width="160" /> <text type="string" length="1" follows="left|top" - height="15" + height="18" layout="topleft" - left_delta="175" + left_pad="0" name="meters" - top_delta="0" - width="40"> + width="60"> Meters </text> + <button + follows="top|left" + layout="topleft" + left_pad="0" + height="28" + width="28" + name="Refresh" + image_overlay="Refresh_Off" /> <scroll_list - follows="left|top|right|bottom" - height="175" + follows="all" + height="100" + border="false" layout="topleft" - left="10" + left="0" name="NearMe" sort_column="0" - top="57" - width="115" /> + top="50" + width="132" /> </panel> </tab_container> <button - follows="left|bottom" - height="20" - label="Select" - label_selected="Select" - layout="topleft" - left="10" - name="Select" - top="324" - width="95" /> + follows="right|bottom" + height="23" + label="OK" + label_selected="OK" + name="ok_btn" + top_pad="3" + left="46" + width="100" /> <button - follows="left|bottom" - height="20" + follows="right|bottom" + height="23" label="Cancel" label_selected="Cancel" - layout="topleft" - left_pad="70" - name="Cancel" - top_delta="0" - width="95" /> + name="cancel_btn" + width="100" + left_pad="5" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index 9e2c8a44d1..bac3ea86f1 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml @@ -1,211 +1,321 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="950" + legacy_header_height="18" + height="700" layout="topleft" name="avatar_texture_debug" - title="Avatar Textures" - width="960"> + help_topic="avatar_texture_debug" + title="AVATAR TEXTURES" + width="940" + can_resize="true"> <floater.string name="InvalidAvatar"> INVALID AVATAR </floater.string> + + <scroll_container + color="DkGray2" + opaque="true" + follows="all" + height="680" + layout="topleft" + left="5" + top_pad="15" + name="profile_scroll" + reserve_scroll_corner="false" + width="930"> + <panel + name="scroll_content_panel" + follows="left|top" + min_height="300" + layout="topleft" + top="0" + background_visible="false" + left="0" + height="680"> <text type="string" length="1" height="16" layout="topleft" - left="10" + left="15" name="label" - top="24" - width="80"> - Baked Textures + top="20" + width="90"> + Baked +Textures </text> <text type="string" length="1" height="16" layout="topleft" - left_pad="60" + left_pad="22" name="composite_label" top_delta="0" width="120"> - Composite Textures + Composite +Textures </text> <button - height="20" + height="40" label="Dump IDs to Console" label_selected="Dump" layout="topleft" - left_pad="530" name="Dump" - top_delta="1" + top_delta="0" + right="-10" width="150" /> + + <panel + name="scroll_content_panel" + follows="left|top" + min_height="300" + layout="topleft" + top="43" + background_visible="false" + height="930" + left="0" + width="1230"> + <texture_picker - height="143" + height="103" label="Hair" layout="topleft" left="10" name="hair-baked" - top="47" - width="128" /> + top="17" + width="92" /> <texture_picker - height="143" + height="103" label="Hair" layout="topleft" + left_pad="21" + name="hair_grain" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Hair Alpha" + layout="topleft" left_pad="7" - name="hair" + name="hair_alpha" top_delta="0" - width="128" /> + width="92" /> + <texture_picker - height="143" + height="103" label="Head" layout="topleft" left="10" name="head-baked" - top="197" - width="128" /> + top_delta="100" + width="92" /> <texture_picker - height="143" + height="103" label="Makeup" layout="topleft" + left_pad="21" + name="head_bodypaint" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Head Alpha" + layout="topleft" + left_pad="7" + name="head_alpha" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Head Tattoo" + layout="topleft" left_pad="7" - name="head bodypaint" + name="head_tattoo" top_delta="0" - width="128" /> + width="92" /> + <texture_picker - height="143" + height="103" label="Eyes" layout="topleft" left="10" name="eyes-baked" - top="347" - width="128" /> + top_delta="100" + width="92" /> <texture_picker - height="143" + height="103" label="Eye" layout="topleft" + left_pad="21" + name="eyes_iris" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Eyes Alpha" + layout="topleft" left_pad="7" - name="iris" + name="eyes_alpha" top_delta="0" - width="128" /> + width="92" /> + <texture_picker - height="143" + height="103" label="Upper Body" layout="topleft" left="10" name="upper-baked" - top="497" - width="128" /> + top_delta="100" + width="92" /> <texture_picker - height="143" - label="Upper Body Tattoo" + height="103" + label="Upper BodyPaint" layout="topleft" - left_pad="7" - name="upper bodypaint" + left_pad="21" + name="upper_bodypaint" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Undershirt" layout="topleft" left_pad="7" - name="undershirt" + name="upper_undershirt" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Gloves" layout="topleft" left_pad="7" - name="gloves" + name="upper_gloves" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Shirt" layout="topleft" left_pad="7" - name="shirt" + name="upper_shirt" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Upper Jacket" layout="topleft" left_pad="7" - name="upper jacket" + name="upper_jacket" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" + label="Upper Alpha" + layout="topleft" + left_pad="7" + name="upper_alpha" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Upper Tattoo" + layout="topleft" + left_pad="7" + name="upper_tattoo" + top_delta="0" + width="92" /> + + <texture_picker + height="103" label="Lower Body" layout="topleft" left="10" name="lower-baked" - top="647" - width="128" /> + top_delta="100" + width="92" /> <texture_picker - height="143" - label="Lower Body Tattoo" + height="103" + label="Lower BodyPaint" layout="topleft" - left_pad="7" - name="lower bodypaint" + left_pad="21" + name="lower_bodypaint" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Underpants" layout="topleft" left_pad="7" - name="underpants" + name="lower_underpants" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Socks" layout="topleft" left_pad="7" - name="socks" + name="lower_socks" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Shoes" layout="topleft" left_pad="7" - name="shoes" + name="lower_shoes" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Pants" layout="topleft" left_pad="7" - name="pants" + name="lower_pants" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" label="Jacket" layout="topleft" left_pad="7" - name="lower jacket" + name="lower_jacket" top_delta="0" - width="128" /> + width="92" /> <texture_picker - height="143" + height="103" + label="Lower Alpha" + layout="topleft" + left_pad="7" + name="lower_alpha" + top_delta="0" + width="92" /> + <texture_picker + height="103" + label="Lower Tattoo" + layout="topleft" + left_pad="7" + name="lower_tattoo" + top_delta="0" + width="92" /> + + <texture_picker + height="103" label="Skirt" layout="topleft" left="10" name="skirt-baked" - top="797" - width="128" /> + top_delta="100" + width="92" /> <texture_picker - height="143" + height="103" label="Skirt" layout="topleft" - left_pad="7" + left_pad="21" name="skirt" top_delta="0" - width="128" /> -</floater> + width="92" /> +</panel> +</panel> +</scroll_container> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 41ddec6395..4fc2b698d8 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -1,73 +1,64 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - control_name="BeaconAlwaysOn" + legacy_header_height="18" height="225" layout="topleft" name="beacons" + help_topic="beacons" save_rect="true" - title="Beacons" - width="250"> + save_visibility="true" + single_instance="true" + title="BEACONS" + width="240"> <panel follows="left|top|right|bottom" height="200" layout="topleft" left="10" name="beacons_panel" - top="15" + top="20" width="230"> + <text + follows="all" + height="16" + font="SansSerif" + name="label_show" + text_color="White" + type="string"> + Show : + </text> <check_box - bottom_delta="33" - control_name="scripttouchbeacon" - label="Scripted Objects with Touch Only" - layout="topleft" - name="touch_only" /> - <check_box - bottom_delta="20" - control_name="scriptsbeacon" - label="Scripted Objects" - layout="topleft" - name="scripted" /> - <check_box - bottom_delta="20" - control_name="physicalbeacon" - label="Physical Objects" - layout="topleft" - name="physical" /> - <check_box - bottom_delta="20" - control_name="soundsbeacon" - label="Sound Sources" - layout="topleft" - name="sounds" /> - <check_box - bottom_delta="20" - control_name="particlesbeacon" - label="Particle Sources" + control_name="renderbeacons" + height="16" + width="100" + label="Beacons" layout="topleft" - name="particles" /> - <check_box - bottom_delta="20" + name="beacons" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box control_name="renderhighlights" - label="Render Highlights" - layout="topleft" - name="highlights" /> - <check_box - bottom_delta="20" - control_name="renderbeacons" - label="Render Beacons" + height="16" + left_pad="10" + label="Highlights" layout="topleft" - name="beacons" /> + name="highlights" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> <text type="string" length="1" follows="left|top" - height="12" + height="16" layout="topleft" - left="5" + left="20" + tool_tip="Beacon width" name="beacon_width_label" - top="171" + top_pad="3" width="128"> - Beacon Width: + Width: </text> <slider control_name="DebugBeaconLineWidth" @@ -76,11 +67,72 @@ increment="1" initial_value="1" layout="topleft" - left="30" max_val="16" min_val="1" name="beacon_width" - top="187" - width="185" /> + top_pad="0" + width="180" /> + <text + follows="all" + height="16" + font="SansSerif" + left="0" + top_pad="5" + name="label_objects" + text_color="White" + type="string"> + For these objects: + </text> + <check_box + control_name="physicalbeacon" + height="16" + left="0" + label="Physical" + layout="topleft" + name="physical" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box + control_name="scriptsbeacon" + height="16" + left="0" + label="Scripted" + layout="topleft" + name="scripted"> + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box + control_name="scripttouchbeacon" + height="16" + top_pad="4" + left="20" + label="Touch only" + layout="topleft" + name="touch_only" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box + control_name="soundsbeacon" + height="16" + left="0" + label="Sound sources" + layout="topleft" + name="sounds" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + <check_box + control_name="particlesbeacon" + height="16" + label="Particle sources" + layout="topleft" + name="particles" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index af5c006779..56230e912c 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -1,71 +1,82 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" follows="right" - height="151" + height="170" layout="topleft" name="build options floater" + help_topic="build_options_floater" save_rect="true" - title="Grid Options" - width="272"> + title="GRID OPTIONS" + width="264"> <spinner control_name="GridResolution" follows="left|top" - height="16" + height="23" initial_value="1" - label="Grid Unit (meters)" - label_width="110" + label="Grid Units (meters)" + label_width="160" layout="topleft" - left="14" + left="10" max_val="5" min_val="0.01" name="GridResolution" - top="37" - width="170" /> + top="25" + width="230" /> <spinner control_name="GridDrawSize" decimal_digits="1" follows="left|top" - height="16" + height="23" increment="0.5" initial_value="5" label="Grid Extents (meters)" - label_width="110" + label_width="160" layout="topleft" left_delta="0" max_val="50" min_val="1" name="GridDrawSize" - top_pad="5" - width="170" /> + top_pad="0" + width="230" /> <check_box control_name="GridSubUnit" height="16" - label="Enable Sub-Unit Snapping" + label="Snap to sub-units" layout="topleft" - left_delta="0" name="GridSubUnit" - top_pad="5" + top_pad="0" width="200" /> <check_box control_name="GridCrossSections" height="16" - label="Show Cross Sections" + label="View cross-sections" layout="topleft" - left_delta="0" name="GridCrossSection" top_pad="5" width="200" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + tool_tip="Grid opacity" + name="grid_opacity_label" + top_pad="5" + width="128"> + Opacity: + </text> <slider control_name="GridOpacity" follows="left" - height="16" + height="18" increment="0.05" initial_value="0.7" - label="Grid Opacity" layout="topleft" - left_delta="0" name="GridOpacity" show_text="false" - top_pad="5" - width="200" /> + top_pad="0" + width="210" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index cf75da078e..457142f11c 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_tear_off="false" - height="340" + height="310" layout="topleft" name="floaterbulkperms" - title="Bulk change content permissions" - width="480"> + help_topic="floaterbulkperms" + title="EDIT CONTENT PERMISSIONS" + width="300"> <floater.string name="nothing_to_modify_text"> Selection contains no editable contents. @@ -22,316 +24,290 @@ name="done_text"> Finished permission change requests. </floater.string> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="10" - layout="topleft" - left="10" - name="applyto" - top="30" - width="206"> - Content Types - </text> - <icon - height="16" - image_name="inv_item_animation.tga" - layout="topleft" - left_delta="2" - mouse_opaque="true" - name="icon_animation" - top_pad="14" - width="16" /> + <check_box control_name="BulkChangeIncludeAnimations" height="16" - label="Animation" - layout="topleft" - left_pad="2" name="check_animation" - top_delta="0" - width="126" /> + top="24" + left="10" + width="16" /> <icon height="16" - image_name="inv_folder_bodypart.tga" - layout="topleft" - left="12" + image_name="Inv_Animation" mouse_opaque="true" - name="icon_bodypart" - top="74" - width="16" /> + name="icon_animation" + tool_tip="Animation" + left_pad="5" /> <check_box control_name="BulkChangeIncludeBodyParts" height="16" - label="Body Parts" - layout="topleft" - left_pad="2" name="check_bodypart" - top_delta="0" - width="126" /> + left="10" + width="16" + top_pad="2" /> <icon height="16" - image_name="inv_item_shirt.tga" - layout="topleft" - left="12" + image_name="Inv_Eye" + tool_tip="Body Parts" mouse_opaque="true" - name="icon_clothing" - top="94" - width="16" /> + name="icon_bodypart" + left_pad="2" /> <check_box control_name="BulkChangeIncludeClothing" height="16" - label="Clothing" - layout="topleft" - left_pad="2" name="check_clothing" - top_delta="0" - width="126" /> + left="10" + width="16" + top_pad="5" /> <icon height="16" - image_name="inv_item_gesture.tga" - layout="topleft" - left="12" + image_name="Inv_Shirt" mouse_opaque="true" - name="icon_gesture" - top="114" - width="16" /> - <check_box + name="icon_clothing" + tool_tip="Clothing" + left_pad="2" /> + <check_box control_name="BulkChangeIncludeGestures" height="16" - label="Gestures" - layout="topleft" - left_pad="2" name="check_gesture" - top_delta="0" - width="126" /> - <icon - height="16" - image_name="inv_item_landmark_visited.tga" - layout="topleft" - left="12" - mouse_opaque="true" - name="icon_landmark" - top="134" - width="16" /> - <check_box - control_name="BulkChangeIncludeLandmarks" - height="16" - label="Landmarks" - layout="topleft" - left_pad="2" - name="check_landmark" - top_delta="0" - width="126" /> + left="65" + width="16" + top="25" /> <icon height="16" - image_name="inv_item_notecard.tga" + image_name="Inv_Gesture" layout="topleft" - left="12" mouse_opaque="true" - name="icon_notecard" - top="154" - width="16" /> + name="icon_gesture" + tool_tip="Gestures" + left_pad="2" /> <check_box control_name="BulkChangeIncludeNotecards" height="16" - label="Notecards" layout="topleft" - left_pad="2" name="check_notecard" - top_delta="0" - width="126" /> + left="65" + width="16" + top_pad="5" /> <icon height="16" - image_name="inv_item_object.tga" + image_name="Inv_Notecard" layout="topleft" - left="12" mouse_opaque="true" - name="icon_object" - top="174" - width="16" /> - <check_box + name="icon_notecard" + tool_tip="Notecards" + left_pad="4" /> + <check_box control_name="BulkChangeIncludeObjects" height="16" - label="Objects" - layout="topleft" - left_pad="2" name="check_object" - top_delta="0" - width="126" /> - <icon + left="65" + top_pad="5" + width="16" /> + <icon height="16" - image_name="inv_item_script.tga" - layout="topleft" - left="12" + image_name="Inv_Object" mouse_opaque="true" - name="icon_script" - top="194" - width="16" /> + name="icon_object" + tool_tip="Objects" + left_pad="2" /> <check_box control_name="BulkChangeIncludeScripts" height="16" - label="Scripts" - layout="topleft" - left_pad="2" name="check_script" - top_delta="0" - width="126" /> + top="25" + left="120" + width="16" + /> <icon height="16" - image_name="inv_item_sound.tga" + image_name="Inv_Script" layout="topleft" - left="12" mouse_opaque="true" - name="icon_sound" - top="214" - width="16" /> + name="icon_script" + tool_tip="Scripts" + left_pad="4" /> <check_box control_name="BulkChangeIncludeSounds" height="16" - label="Sounds" - layout="topleft" - left_pad="2" name="check_sound" - top_delta="0" - width="126" /> + top_pad="5" + left="120" + width="16" /> <icon height="16" - image_name="inv_item_texture.tga" - layout="topleft" - left="12" + image_name="Inv_Sound" mouse_opaque="true" - name="icon_texture" - top="234" - width="16" /> + name="icon_sound" + tool_tip="Sounds" + left_pad="4" /> <check_box control_name="BulkChangeIncludeTextures" height="16" - label="Textures" - layout="topleft" - left_pad="2" name="check_texture" - top_delta="0" - width="126" /> + top_pad="5" + left="120" + width="16" /> + <icon + height="16" + image_name="Inv_Texture" + mouse_opaque="true" + name="icon_texture" + tool_tip="Textures" + left_pad="2" /> + <button - follows="left|top" - height="20" - label="Check All" - label_selected="All" - layout="topleft" - left="8" - name="check_all" - top="257" - width="100" /> + height="23" + layout="topleft" + name="check_all" + label="√ All" + left="180" + top="26" + width="115"> + <button.commit_callback + function="BulkPermission.CheckAll" /> + </button> <button follows="left|top" - height="20" - label="Uncheck All" + height="23" + label="Clear" label_selected="None" layout="topleft" - left_delta="0" + top_pad="8" name="check_none" - top_pad="4" - width="100" /> + width="115" > + <button.commit_callback + function="BulkPermission.UncheckAll"/> + </button> + <text type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + font="SansSerifLarge" + height="16" layout="topleft" - left="165" + left="10" name="newperms" - top="30" - width="206"> - New Permissions + top="90" + width="250"> + New Content Permissions + </text> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + height="28" + left="10" + name="GroupLabel" + width="92" + word_wrap="true"> + Group: </text> <check_box control_name="BulkChangeShareWithGroup" height="16" - label="Share with group" + label="Share" layout="topleft" - left="170" + top_pad="0" name="share_with_group" - top="54" - width="106" /> + width="92" /> + <text + type="string" + length="1" + follows="left|top" + height="28" + layout="topleft" + name="AnyoneLabel" + left="104" + top="110" + width="92" + word_wrap="true"> + Anyone: + </text> <check_box control_name="BulkChangeEveryoneCopy" height="16" - label="Allow anyone to copy" + label="Copy" layout="topleft" - left_delta="0" + top_pad="0" name="everyone_copy" - top_pad="16" - width="130" /> + width="92" /> <text type="string" length="1" follows="left|top" - height="10" + height="28" layout="topleft" - left_delta="0" name="NextOwnerLabel" - top_pad="16" - width="88"> - Next owner can: + top="110" + left="189" + width="92" + word_wrap="true"> + Next owner: </text> <check_box control_name="BulkChangeNextOwnerModify" height="16" label="Modify" layout="topleft" - left_delta="0" name="next_owner_modify" - top_pad="14" - width="78" /> + top_pad="0" + width="92" /> <check_box control_name="BulkChangeNextOwnerCopy" height="16" label="Copy" layout="topleft" - left_delta="78" + top_pad="0" name="next_owner_copy" - top_delta="0" - width="88" /> - <check_box + width="92"> + <check_box.commit_callback + function="BulkPermission.CommitCopy"/> + </check_box> + <check_box control_name="BulkChangeNextOwnerTransfer" - enabled="false" + enabled_control="BulkChangeNextOwnerCopy" height="16" + top_pad="0" initial_value="true" - label="Resell/Give away" + label="Transfer" layout="topleft" - left_delta="88" name="next_owner_transfer" - top_delta="0" - width="106" /> + tool_tip="Next owner can give away or resell this object" + width="92" /> <scroll_list enabled="false" - follows="left|top|right|bottom" - height="130" + follows="all" + height="95" layout="topleft" - left="130" + left="10" name="queue output" - top="170" - width="335" /> + top="175" + width="250" /> <button follows="left|top" - height="20" - label="Apply" + height="23" + label="OK" layout="topleft" - left="265" + left="95" name="apply" - top="310" - width="100" /> + top_pad="10" + width="90"> + <button.commit_callback + function="BulkPermission.Apply"/> + </button> <button follows="left|top" - height="20" - label="Close" + height="23" + label="Cancel" layout="topleft" left_pad="5" name="close" - top_delta="0" - width="100" /> + width="100" > + <button.commit_callback + function="BulkPermission.Close"/> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml index 4fb2fe24cc..303c28d7c8 100644 --- a/indra/newview/skins/default/xui/en/floater_bumps.xml +++ b/indra/newview/skins/default/xui/en/floater_bumps.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="180" layout="topleft" name="floater_bumps" + help_topic="floater_bumps" save_rect="true" - title="Bumps, Pushes & Hits" + title="BUMPS, PUSHES & HITS" width="400"> <floater.string name="none_detected"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 174337480a..77a0e9b91b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - height="250" + height="290" layout="topleft" min_height="150" min_width="200" name="floater_buy_contents" + help_topic="floater_buy_contents" save_rect="true" - title="Buy Contents" - width="300"> + title="BUY CONTENTS" + width="280"> <floater.string name="no_copy_text"> (no copy) @@ -21,27 +23,29 @@ name="no_transfer_text"> (no transfer) </floater.string> - <text + <text type="string" length="1" follows="left|top|right" font="SansSerif" height="16" + top="22" + left="10" layout="topleft" - left="15" name="contains_text" - top="24" - width="281"> + width="276"> [NAME] contains: </text> <scroll_list - follows="left|top|right|bottom" - height="148" + background_visible="true" + draw_border="false" + follows="all" + height="163" layout="topleft" - left_delta="0" + left="10" name="item_list" top_pad="4" - width="281"> + width="260"> <scroll_list.columns name="icon" width="16" /> @@ -52,43 +56,42 @@ <text type="string" length="1" - follows="left|right|bottom" + follows="left|bottom" font="SansSerif" - height="24" + height="16" layout="topleft" - left_delta="0" + left="10" name="buy_text" - top_pad="4" - width="281"> + text_color="white" + top="220" + width="260"> Buy for L$[AMOUNT] from [NAME]? </text> - <button - follows="right|bottom" - height="20" - label="Cancel" - label_selected="Cancel" + <check_box + follows="left|bottom" + height="16" + label="Wear clothing now" layout="topleft" - left="216" - name="cancel_btn" - top="224" - width="60" /> + left="10" + name="wear_check" + width="250" /> <button follows="right|bottom" - height="20" + height="23" label="Buy" label_selected="Buy" layout="topleft" - left_delta="-64" + left="65" name="buy_btn" - top_delta="0" - width="60" /> - <check_box - follows="left|bottom" - height="20" - label="Wear clothing now" + top_pad="5" + width="100" /> + <button + follows="right|bottom" + height="23" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_delta="-139" - name="wear_check" - top_delta="0" - width="135" /> + left_pad="5" + name="cancel_btn" + width="100" /> </floater> 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 245d84fff4..637f9f55d4 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -1,294 +1,325 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <floater + legacy_header_height="18" can_minimize="false" - height="270" + height="275" layout="topleft" + title="BUY L$" name="buy currency" - title="Buy Currency" + help_topic="buy_linden_dollars" + single_instance="true" width="350"> <floater.string name="buy_currency"> - Buy L$ [LINDENS] for approx. US$ [USD] + Buy L$ [LINDENS] for approx. [LOCALAMOUNT] </floater.string> - <text + <icon + height="215" + image_name="Linden_Dollar_Background" + layout="topleft" + left="0" + name="normal_background" + top="17" + width="350" /> + <text type="string" length="1" - bottom_delta="48" - follows="top|left" + follows="top|left|right" font="SansSerifHuge" - height="24" layout="topleft" - left="16" - name="info_buying" - right="-20"> - Buying Currency: + left="20" + height="30" + top="25" + width="340" + name="info_need_more"> + You need more L$ </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" - font="SansSerifHuge" - height="24" + height="16" layout="topleft" - left="16" - name="info_cannot_buy" - right="-20"> - Cannot buy now: + top="246" + left="15" + width="300" + name="contacting"> + Contacting LindeX... </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" font="SansSerifHuge" - height="24" layout="topleft" - left="16" - name="info_need_more" - right="-20"> - You need more currency: + left="20" + height="30" + top="25" + width="300" + name="info_buying"> + Buy L$ </text> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_error" - top="48" - width="64" /> <text type="string" length="1" - bottom_delta="96" - follows="top|left" - height="140" - layout="topleft" - left="72" - name="error_message" - right="-20"> - Something ain't right. - </text> - <button - follows="bottom|left" - height="20" - label="Go to website" - layout="topleft" - left_delta="0" - name="error_web" - top_delta="124" - width="120" /> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_1" - top="48" - width="64" /> - <text - type="string" - length="1" - bottom_delta="-38" follows="top|left" + font="SansSerifMedium" height="16" layout="topleft" - left="72" - name="contacting" - right="-20"> - Contacting LindeX... + left="20" + name="balance_label" + top="65" + width="210"> + I have </text> <text type="string" length="1" - bottom_delta="0" + font="SansSerifMedium" follows="top|left" + halign="right" height="16" layout="topleft" - left="72" - name="buy_action_unknown" - right="-20"> - Buy L$ on the LindeX currency exchange + left="200" + name="balance_amount" + top_delta="0" + width="120"> + L$ [AMT] </text> <text type="string" length="1" - bottom_delta="0" follows="top|left" + font="SansSerifMedium" height="16" + top="95" layout="topleft" - left="72" - name="buy_action" - right="-20"> - [NAME] L$ [PRICE] + left="20" + name="currency_action" + width="210"> + I want to buy </text> <text + font="SansSerifMedium" type="string" length="1" - follows="top|left" + follows="left|top" height="16" layout="topleft" - left_delta="0" - name="currency_action" - top_pad="4" - width="40"> - Buy L$ + top_delta="0" + left="217" + name="currency_label" + width="15"> + L$ </text> <line_editor type="string" - length="1" - follows="top|right" - height="16" - layout="topleft" - left_pad="5" + max_length="10" + halign="right" + font="SansSerifMedium" + select_on_focus="true" + follows="top|left" + top_delta="-7" + height="22" + label="L$" + left_pad="3" name="currency_amt" - top_delta="0" - width="80"> + width="85"> 1234 </line_editor> <text type="string" + font="SansSerifMedium" length="1" - follows="top|right" + follows="top|left" height="16" layout="topleft" - left_pad="5" - name="currency_est" - top_delta="0" - width="180"> - for approx. US$ [USD,number,2] + left="20" + top="125" + name="buying_label" + width="210"> + For the price </text> <text type="string" length="1" - follows="top|right" + font="SansSerifMedium" + text_color="EmphasisColor" + follows="top|left" + halign="right" height="16" - layout="topleft" - left_delta="5" - name="getting_data" top_delta="0" - width="180"> - Getting data... + layout="topleft" + left="150" + name="currency_est" + width="170"> + approx. [LOCALAMOUNT] </text> <text type="string" + font="SansSerifSmall" + text_color="EmphasisColor" length="1" follows="top|left" height="16" layout="topleft" - left="80" - name="balance_label" - top="110" - width="240"> - You currently have + top="125" + left="170" + width="150" + halign="right" + name="getting_data"> + Estimating... </text> <text type="string" + font="SansSerifSmall" + top="145" length="1" follows="top|left" - halign="right" height="16" + halign="right" + left="20" + width="300" layout="topleft" - left_delta="0" - name="balance_amount" - top_delta="0" - width="240"> - L$ [AMT] + name="buy_action"> + [ACTION] </text> <text type="string" + font="SansSerifMedium" length="1" follows="top|left" height="16" layout="topleft" - left_delta="0" - name="buying_label" - top_pad="4" - width="240"> - You are buying + left="20" + name="total_label" + top="165" + width="210"> + My new balance will be </text> <text type="string" length="1" + font="SansSerifMedium" follows="top|left" - halign="right" + top_delta="0" height="16" layout="topleft" - left_delta="0" - name="buying_amount" - top_delta="0" - width="240"> + left="200" + halign="right" + name="total_amount" + width="120"> L$ [AMT] </text> <text type="string" length="1" + text_color="0.7 0.7 0.7 0.5" follows="top|left" - height="16" layout="topleft" - left_delta="0" - name="total_label" - top_pad="4" - width="240"> - Your balance will be + halign="right" + top="189" + left="20" + width="300" + height="30" + name="currency_links"> + [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] </text> <text type="string" length="1" + text_color="0.7 0.7 0.7 0.5" follows="top|left" - halign="right" - height="16" layout="topleft" - left_delta="0" - name="total_amount" - top_delta="0" - width="240"> - L$ [AMT] + halign="right" + top="202" + left="20" + width="300" + height="30" + name="exchange_rate_note"> +Re-enter amount to see the latest exchange rate. </text> <text type="string" length="1" - bottom_delta="48" + text_color="0.7 0.7 0.7 0.5" follows="top|left" - height="32" layout="topleft" - left="72" - name="purchase_warning_repurchase" - right="-20"> - Confirming this purchase only buys the currency. -You'll need to try the operation again. + halign="right" + top="213" + left="10" + width="310" + height="30" + name="purchase_warning_repurchase"> + Confirming this purchase only buys L$, not the object. </text> <text type="string" length="1" - bottom_delta="0" + text_color="0.7 0.7 0.7 0.5" follows="top|left" - height="32" layout="topleft" - left="72" - name="purchase_warning_notenough" - right="-20"> - You aren't buying enough currency -Increase the amount to buy. + halign="right" + top="213" + left="20" + width="300" + height="30" + name="purchase_warning_notenough"> + You aren't buying enough L$. Please increase the amount. </text> + + <button + follows="bottom|left" + height="20" + label="Buy Now" + layout="topleft" + left="151" + name="buy_btn" + top="242" + width="90"/> <button follows="bottom|right" height="20" label="Cancel" layout="topleft" - left="237" + left_pad="10" name="cancel_btn" - top="234" - width="90" /> - <button - follows="bottom|left" - height="20" - label="Purchase" + width="90"/> + <icon + height="215" + image_name="Linden_Dollar_Alert" layout="topleft" - left_delta="-96" - name="buy_btn" - top_delta="0" - width="90" /> + left="0" + name="error_background" + top="15" + width="350"/> + <text + type="string" + font="SansSerifHuge" + left="165" + width="170" + height="25" + top="25" + name="info_cannot_buy"> + Unable to Buy + </text> + <text + type="string" + width="176" + height="125" + top="60" + left="165" + word_wrap="true" + follows="bottom|right" + name="cannot_buy_message"> + </text> + <button + follows="bottom|left" + height="20" + label="Continue to the Web" + layout="topleft" + left="170" + name="error_web" + top="200" + width="160"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml new file mode 100644 index 0000000000..b9c415633f --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="false" + can_close="true" + width="422" + height="202" + layout="topleft" + name="floater_buy_currency_html" + help_topic="floater_buy_currency_html" + save_rect="true" + single_instance="true" + title="BUY CURRENCY" +> + <floater.string + name="buy_currency_url" translate="false"> + https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&sum=[SUM]&msg=[MSG]&bal=[BAL] + </floater.string> + <web_browser + trusted_content="true" + follows="all" + layout="topleft" + left="1" + right="-1" + top="1" + bottom="-1" + ignore_ui_scale="false" + name="browser"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index e11534cc13..c88de878f4 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="484" layout="topleft" name="buy land" - title="Buy Land" + help_topic="buy_land" + single_instance="true" + title="BUY LAND" width="740"> <floater.string name="can_resell"> @@ -61,7 +64,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="not_owned_by_you"> - Land owned by another user is selected. + Land owned by another Resident is selected. Try selecting a smaller area. </floater.string> <floater.string @@ -104,7 +107,7 @@ Try selecting a smaller area. </floater.string> <floater.string name="land_holdings"> - You hold [BUYER] sq.m. of land. + You hold [BUYER] m² of land. </floater.string> <floater.string name="pay_to_for_land"> @@ -112,23 +115,23 @@ Try selecting a smaller area. </floater.string> <floater.string name="buy_for_US"> - Buy L$ [AMOUNT] for approx. US$ [AMOUNT2], + Buy L$ [AMOUNT] for approx. [LOCAL_AMOUNT], </floater.string> <floater.string name="parcel_meters"> - This parcel is [AMOUNT] sq.m. + This parcel is [AMOUNT] m² </floater.string> <floater.string name="premium_land"> - This land is premium, and will charge as [AMOUNT] sq.m. + This land is premium, and will charge as [AMOUNT] m². </floater.string> <floater.string name="discounted_land"> - This land is discounted, and will charge as [AMOUNT] sq.m. + This land is discounted, and will charge as [AMOUNT] m². </floater.string> <floater.string name="meters_supports_object"> - [AMOUNT] sq.m. + [AMOUNT] m² supports [AMOUNT2] objects </floater.string> <floater.string @@ -142,7 +145,7 @@ supports [AMOUNT2] objects <floater.string name="info_price_string"> L$ [PRICE] -(L$ [PRICE_PER_SQM]/sq.m.) +(L$ [PRICE_PER_SQM]/m²) [SOLD_WITH_OBJECTS] </floater.string> <floater.string @@ -170,9 +173,17 @@ supports [AMOUNT2] objects (no parcel selected) </floater.string> <floater.string - name="buy_currency"> - Buy L$ [LINDENS] for approx. US$ [USD] - </floater.string> + name="icon_PG" + translate="false" + value="Parcel_PG_Dark"/> + <floater.string + name="icon_M" + translate="false" + value="Parcel_M_Dark"/> + <floater.string + name="icon_R" + translate="false" + value="Parcel_R_Dark"/> <text type="string" length="1" @@ -196,9 +207,17 @@ supports [AMOUNT2] objects left_delta="110" name="region_name_text" top_delta="0" - width="175"> + use_ellipses="true" + width="155"> (unknown) </text> + <icon + follows="left|top" + height="16" + layout="topleft" + name="rating_icon" + top_delta="-2" + width="18"/> <text type="string" length="1" @@ -361,6 +380,7 @@ supports [AMOUNT2] objects width="275" /> <texture_picker enabled="false" + fallback_image="default_land_picture.j2c" follows="top|left" height="135" layout="topleft" @@ -373,9 +393,11 @@ supports [AMOUNT2] objects length="1" bottom_delta="-119" follows="top|left" + height="16" layout="topleft" left="204" name="info_parcel_label" + top="30" width="48"> Parcel: </text> @@ -388,7 +410,7 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_parcel" - top_delta="-1" + top_pad="1" width="180"> Scotopteryx 138,204 </text> @@ -396,9 +418,11 @@ supports [AMOUNT2] objects type="string" length="1" follows="top|left" + height="16" layout="topleft" left="204" name="info_size_label" + top_pad="1" width="48"> Size: </text> @@ -411,17 +435,19 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_size" - top_delta="-1" + top_pad="1" width="180"> - 1024 sq.m. + 1024 m² </text> <text type="string" length="1" follows="top|left" + height="16" layout="topleft" left="204" name="info_price_label" + top_pad="1" width="48"> Price: </text> @@ -434,10 +460,10 @@ supports [AMOUNT2] objects layout="topleft" left_delta="16" name="info_price" - top_delta="-1" + top_pad="1" width="180"> L$ 1500 -(L$ 1.1/sq.m.) +(L$ 1.1/m²) sold with objects </text> <text @@ -449,7 +475,7 @@ sold with objects layout="topleft" left="16" name="info_action" - top="156" + top="166" width="350"> Buying this land will: </text> @@ -474,7 +500,8 @@ sold with objects name="error_message" right="435" top="208" - width="215"> + width="215" + word_wrap="true"> Something ain't right. </text> <button @@ -484,7 +511,7 @@ sold with objects layout="topleft" left_delta="0" name="error_web" - top_delta="144" + top_delta="154" width="120" /> <locate height="-200" @@ -502,13 +529,14 @@ sold with objects length="1" follows="top|left" font="SansSerifBig" - height="16" + height="32" layout="topleft" left="72" name="account_action" right="438" - top="190" - width="218"> + top="200" + width="218" + wrap="true"> Upgrade you to premium membership. </text> <text @@ -531,11 +559,14 @@ sold with objects name="account_level" width="336"> <combo_box.item - label="US$9.95/month, billed monthly" /> + label="US$9.95/month, billed monthly" + name="US$9.95/month,billedmonthly" /> <combo_box.item - label="US$7.50/month, billed quarterly" /> + label="US$7.50/month, billed quarterly" + name="US$7.50/month,billedquarterly" /> <combo_box.item - label="US$6.00/month, billed annually" /> + label="US$6.00/month, billed annually" + name="US$6.00/month,billedannually" /> </combo_box> <locate height="10" @@ -547,19 +578,21 @@ sold with objects layout="topleft" left="0" name="step_2" + top_pad="-10" width="64" /> <text type="string" length="1" follows="top|left" font="SansSerifBig" - height="16" + height="32" layout="topleft" left="72" name="land_use_action" right="438" - top="274" - width="218"> + top="284" + width="218" + wrap="true"> Increase your monthly land use fees to US$ 40/month. </text> <text @@ -571,9 +604,10 @@ sold with objects left="72" name="land_use_reason" right="435" - width="215"> - You hold 1309 sq.m. of land. - This parcel is 512 sq.m. of land. + width="215" + word_wrap="true"> + You hold 1309 m² of land. +This parcel is 512 m² of land. </text> <locate height="10" @@ -589,14 +623,15 @@ sold with objects <text type="string" length="1" - bottom_delta="-38" + bottom_delta="-22" follows="top|left" font="SansSerifBig" - height="16" + height="32" layout="topleft" left="72" name="purchase_action" - right="438"> + right="438" + wrap="true"> Pay Joe Resident L$ 4000 for the land </text> <text @@ -634,7 +669,7 @@ sold with objects layout="topleft" left="170" name="currency_amt" - top="398" + top="424" width="80"> 1000 </line_editor> @@ -650,9 +685,9 @@ sold with objects layout="topleft" left="260" name="currency_est" - top="399" + top="425" width="178"> - for approx. US$ [AMOUNT2] + for approx. [LOCAL_AMOUNT] </text> <text type="string" @@ -668,7 +703,7 @@ sold with objects <check_box follows="bottom|left" height="20" - label="Remove [AMOUNT] square meters of contribution from group." + label="Remove [AMOUNT] m² of contribution from group." layout="topleft" left_delta="3" name="remove_contribution" @@ -682,7 +717,7 @@ sold with objects layout="topleft" left="70" name="buy_btn" - top="448" + top="460" width="100" /> <button follows="bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 44ef32ee36..3d8f5d678b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml @@ -1,14 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - height="250" + height="290" layout="topleft" - min_height="175" - min_width="154" + min_height="150" + min_width="225" name="contents" + help_topic="contents" save_rect="true" - title="Buy Copy of Object" - width="300"> + single_instance="true" + title="BUY COPY OF OBJECT" + width="280"> <floater.string name="title_buy_text"> Buy @@ -30,19 +33,21 @@ (no transfer) </floater.string> <scroll_list + background_visible="true" + draw_border="false" follows="left|top|right" - height="36" + height="35" layout="topleft" - left="15" name="object_list" - top="24" - width="281"> + top="20" + left="10" + width="260"> <scroll_list.columns name="icon" width="16" /> <scroll_list.columns name="text" - width="300" /> + width="234" /> </scroll_list> <text type="string" @@ -51,58 +56,62 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="10" name="contents_text" - top_pad="4" - width="281"> - and its contents: + top_pad="5" + width="260"> + Contains: </text> <scroll_list - follows="left|top|right|bottom" - height="108" + background_visible="true" + draw_border="false" + follows="all" + height="145" layout="topleft" left_delta="0" name="item_list" top_pad="4" - width="281"> + width="260"> <scroll_list.columns name="icon" width="16" /> <scroll_list.columns name="text" - width="300" /> + width="234" /> </scroll_list> <text type="string" length="1" follows="left|right|bottom" font="SansSerif" - height="24" + height="16" layout="topleft" left_delta="0" name="buy_text" - top_pad="4" - width="281"> + text_color="white" + top_pad="5" + use_ellipses="true" + width="260"> Buy for L$[AMOUNT] from [NAME]? </text> <button follows="right|bottom" - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left="216" - name="cancel_btn" - top="224" - width="60" /> - <button - follows="right|bottom" - height="20" + height="23" label="Buy" label_selected="Buy" layout="topleft" - left_delta="-64" + left="65" name="buy_btn" + top_pad="10" + width="100" /> + <button + follows="right|bottom" + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="5" + name="cancel_btn" top_delta="0" - width="60" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 7f24b11d14..da2be18db6 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - can_minimize="false" - center_horiz="true" - follows="top" - height="64" + legacy_header_height="18" + can_dock="true" + can_minimize="true" + can_close="false" + follows="bottom" + height="164" layout="topleft" name="camera_floater" + help_topic="camera_floater" save_rect="true" - width="176"> + save_visibility="true" + save_dock_state="true" + single_instance="true" + width="228"> <floater.string name="rotate_tooltip"> Rotate Camera Around Focus @@ -20,50 +26,262 @@ name="move_tooltip"> Move Camera Up and Down, Left and Right </floater.string> - <joystick_rotate - follows="top|left" - height="64" - image_selected="cam_rotate_in.tga" - image_unselected="cam_rotate_out.tga" + <floater.string + name="camera_modes_title"> + Camera modes + </floater.string> + <floater.string + name="pan_mode_title"> + Orbit Zoom Pan + </floater.string> + <floater.string + name="presets_mode_title"> + Preset Views + </floater.string> + <floater.string + name="free_mode_title"> + View Object + </floater.string> + <panel + border="false" + height="123" layout="topleft" - left="16" - name="cam_rotate_stick" - picture_style="true" - quadrant="left" - scale_image="false" - sound_flags="3" - tool_tip="rotate_tooltip" + left="2" top="0" - width="64" /> - <joystick_zoom - follows="top|left" - height="64" - image_unselected="cam_zoom_out.tga" - layout="topleft" - left_delta="64" - minus_image="cam_zoom_minus_in.tga" - name="zoom" - picture_style="true" - plus_image="cam_zoom_plus_in.tga" - quadrant="left" - scale_image="false" - sound_flags="3" - tool_tip="zoom_tooltip" - top_delta="0" - width="16" /> - <joystick_track - follows="top|left" - height="64" - image_selected="cam_tracking_in.tga" - image_unselected="cam_tracking_out.tga" + mouse_opaque="false" + name="controls" + width="226"> + <panel + color="Transparent" + follows="all" + height="102" + layout="topleft" + left="8" + name="preset_views_list" + opaque="true" + top="24" + width="212" + visible="false"> + <panel_camera_item + name="front_view"> + <panel_camera_item.mousedown_callback + function="CameraPresets.ChangeView" + parameter="front_view" /> + <panel_camera_item.picture + image_name="Cam_Preset_Front_Off" /> + <panel_camera_item.selected_picture + image_name="Cam_Preset_Front_On" /> + <panel_camera_item.text + name="front_view_text"> + Front View + </panel_camera_item.text> + </panel_camera_item> + <panel_camera_item + name="group_view" + top_pad="4"> + <panel_camera_item.mousedown_callback + function="CameraPresets.ChangeView" + parameter="group_view" /> + <panel_camera_item.picture + image_name="Cam_Preset_Side_Off" /> + <panel_camera_item.selected_picture + image_name="Cam_Preset_Side_On" /> + <panel_camera_item.text + name="side_view_text"> + Side View + </panel_camera_item.text> + </panel_camera_item> + <panel_camera_item + name="rear_view" + layout="topleft" + top_pad="4"> + <panel_camera_item.mousedown_callback + function="CameraPresets.ChangeView" + parameter="rear_view" /> + <panel_camera_item.picture + image_name="Cam_Preset_Back_Off" /> + <panel_camera_item.selected_picture + image_name="Cam_Preset_Back_On" /> + <panel_camera_item.text + name="rear_view_text"> + Rear View + </panel_camera_item.text> + </panel_camera_item> + </panel> + <panel + color="Transparent" + follows="all" + height="68" + item_pad="4" + layout="topleft" + left="8" + name="camera_modes_list" + opaque="true" + top="24" + width="212" + visible="false"> + <panel_camera_item + name="object_view"> + <panel_camera_item.mousedown_callback + function="CameraPresets.ChangeView" + parameter="object_view" /> + <panel_camera_item.text + name="object_view_text"> + Object View + </panel_camera_item.text> + <panel_camera_item.picture + image_name="Object_View_Off" /> + <panel_camera_item.selected_picture + image_name="Object_View_On" /> + </panel_camera_item> + <panel_camera_item + name="mouselook_view" + layout="topleft"> + <panel_camera_item.mousedown_callback + function="CameraPresets.ChangeView" + parameter="mouselook_view" /> + <panel_camera_item.text + name="mouselook_view_text"> + Mouselook View + </panel_camera_item.text> + <panel_camera_item.picture + image_name="MouseLook_View_Off" /> + <panel_camera_item.selected_picture + image_name="MouseLook_View_On" /> + </panel_camera_item> + </panel> + <!--TODO: replace + - images --> + <panel + border="false" + class="camera_zoom_panel" + height="114" + layout="topleft" + left="0" + mouse_opaque="false" + name="zoom" + top="20" + width="226"> + <joystick_rotate + follows="top|left" + height="78" + image_selected="Cam_Rotate_In" + image_unselected="Cam_Rotate_Out" + layout="topleft" + left="7" + mouse_opaque="false" + name="cam_rotate_stick" + quadrant="left" + scale_image="false" + sound_flags="3" + visible="true" + tool_tip="Orbit camera around focus" + top="20" + width="78" /> + <button + follows="top|left" + height="18" + image_disabled="AddItem_Disabled" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + layout="topleft" + left_pad="14" + name="zoom_plus_btn" + width="18" + top="18"> + <commit_callback + function="Zoom.plus" /> + <mouse_held_callback + function="Zoom.plus" /> + </button> + <slider_bar + height="50" + layout="topleft" + name="zoom_slider" + orientation="vertical" + tool_tip="Zoom camera toward focus" + top_pad="0" + min_val="0" + max_val="1" + width="18"> + <commit_callback function="Slider.value_changed"/> + </slider_bar> + <button + follows="top|left" + height="18" + image_disabled="MinusItem_Disabled" + image_selected="MinusItem_Press" + image_unselected="MinusItem_Off" + layout="topleft" + name="zoom_minus_btn" + top_pad="0" + width="18"> + <commit_callback + function="Zoom.minus" /> + <mouse_held_callback + function="Zoom.minus" /> + </button> + <joystick_track + follows="top|left" + height="78" + image_selected="Cam_Tracking_In" + image_unselected="Cam_Tracking_Out" + layout="topleft" + left="133" + name="cam_track_stick" + quadrant="left" + scale_image="false" + sound_flags="3" + tool_tip="Move camera up and down, left and right" + top="20" + width="78"/> + </panel> + </panel> + <panel + border="false" + height="42" layout="topleft" - left_delta="16" - name="cam_track_stick" - picture_style="true" - quadrant="left" - scale_image="false" - sound_flags="3" - tool_tip="move_tooltip" - top_delta="0" - width="64" /> + left="2" + top_pad="0" + name="buttons" + width="226"> + <button + height="23" + label="" + layout="topleft" + left="70" + is_toggle="true" + image_overlay="Cam_Avatar_Off" + image_selected="PushButton_Selected_Press" + name="presets_btn" + tab_stop="false" + tool_tip="Preset Views" + top="13" + width="25"> + </button> + <button + height="23" + label="" + layout="topleft" + left_pad="1" + is_toggle="true" + image_overlay="PanOrbit_Off" + image_selected="PushButton_Selected_Press" + name="pan_btn" + tab_stop="false" + tool_tip="Orbit Zoom Pan" + width="25"> + </button> + <button + height="23" + label="" + layout="topleft" + left_pad="1" + image_overlay="Cam_FreeCam_Off" + image_selected="PushButton_Selected_Press" + name="avatarview_btn" + tab_stop="false" + tool_tip="Camera modes" + width="25"> + </button> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml index 428afcff52..dc1ee5f24e 100644 --- a/indra/newview/skins/default/xui/en/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="258" layout="topleft" name="groups" - title="Groups" + help_topic="groups" + title="GROUPS" width="280"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index 08e47f7ef6..421f3a72c6 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -1,30 +1,31 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" follows="left|top" height="380" layout="topleft" name="ColorPicker" - title="Color Picker" + help_topic="colorpicker" + title="COLOR PICKER" width="440"> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="r_val_text" - top="35" + top="25" width="413"> Red: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="128" layout="topleft" @@ -37,20 +38,18 @@ type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="g_val_text" - top="56" width="413"> Green: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="128" layout="topleft" @@ -63,20 +62,18 @@ type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="b_val_text" - top="77" width="413"> Blue: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="128" layout="topleft" @@ -89,20 +86,18 @@ type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="h_val_text" - top="108" width="413"> Hue: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="180" layout="topleft" @@ -115,20 +110,18 @@ type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="s_val_text" - top="129" width="413"> Sat: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="50" layout="topleft" @@ -141,20 +134,18 @@ type="string" length="1" follows="left|top" - font="SansSerif" - height="10" + height="20" layout="topleft" - left="12" + left="10" mouse_opaque="false" name="l_val_text" - top="150" width="413"> Lum: </text> <spinner decimal_digits="0" follows="left" - height="16" + height="20" increment="1" initial_value="50" layout="topleft" @@ -166,40 +157,40 @@ <check_box follows="left|bottom" height="20" - label="Apply Immediately" + label="Apply now" layout="topleft" - left="12" + left="10" name="apply_immediate" - top="353" + top_pad="185" width="100" /> <button - follows="left|top" - height="32" + follows="left|bottom" + height="28" + image_selected="eye_button_active.tga" + image_unselected="eye_button_inactive.tga" layout="topleft" - left_delta="130" + left_pad="50" name="color_pipette" - picture_style="true" - top="341" - width="32" /> + width="28" /> <button follows="right|bottom" - height="20" - label="Cancel" - label_selected="Cancel" + height="23" + label="OK" + label_selected="OK" layout="topleft" - left_delta="75" - name="cancel_btn" - top="353" + right="-120" + top_delta="9" + name="select_btn" width="100" /> <button follows="right|bottom" - height="20" - label="Select" - label_selected="Select" + height="23" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_pad="4" - name="select_btn" - top_delta="0" + left_pad="5" + right="-10" + name="cancel_btn" width="100" /> <text type="string" @@ -207,7 +198,7 @@ follows="left|top" height="16" layout="topleft" - left="12" + left="10" name="Current color:" top="172" width="110"> @@ -219,10 +210,11 @@ follows="left|top" height="16" layout="topleft" - left_delta="0" + left="10" name="(Drag below to save.)" top_pad="66" - width="110"> - (Drag below to save.) + width="130" + wrap="true"> + (Drag below to save) </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 5475a1cf6a..05c958e051 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_close="false" can_minimize="false" height="500" layout="topleft" name="modal container" + open_centered="true" width="600"> <button height="20" @@ -15,15 +17,6 @@ name="Continue" top="465" width="100" /> - <button - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left_delta="-468" - name="Cancel" - top_delta="0" - width="100" /> <text type="string" length="1" @@ -31,9 +24,9 @@ font="SansSerif" height="20" layout="topleft" - left_delta="4" + left="20" name="tos_heading" - top_delta="-450" + top="20" width="552"> Please read the following message carefully. </text> diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml deleted file mode 100644 index 41bd417c12..0000000000 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ /dev/null @@ -1,3574 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - can_minimize="false" - follows="left|top" - height="540" - layout="topleft" - left_delta="-3" - name="floater customize" - save_rect="true" - title="Appearance" - top_delta="-185" - width="494"> - <tab_container - height="483" - layout="topleft" - left="0" - name="customize tab container" - tab_min_width="96" - tab_position="left" - top="24" - width="492"> - <placeholder - label="Body Parts" - layout="topleft" - name="body_parts_placeholder" /> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Shape" - layout="topleft" - left_delta="0" - name="Shape" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left="299" - name="Revert" - top="458" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Body" - label_selected="Body" - layout="topleft" - left="8" - name="Body" - top="65" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Head" - label_selected="Head" - layout="topleft" - left_delta="0" - name="Head" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Eyes" - label_selected="Eyes" - layout="topleft" - left_delta="0" - name="Eyes" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Ears" - label_selected="Ears" - layout="topleft" - left_delta="0" - name="Ears" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Nose" - label_selected="Nose" - layout="topleft" - left_delta="0" - name="Nose" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Mouth" - label_selected="Mouth" - layout="topleft" - left_delta="0" - name="Mouth" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Chin" - label_selected="Chin" - layout="topleft" - left_delta="0" - name="Chin" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Torso" - label_selected="Torso" - layout="topleft" - left_delta="0" - name="Torso" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Legs" - label_selected="Legs" - layout="topleft" - left_delta="0" - name="Legs" - top_pad="16" - width="82" /> - <radio_group - control_name="AvatarSex" - height="34" - layout="topleft" - left_delta="0" - name="sex radio" - top_pad="16" - width="82"> - <radio_item - height="16" - label="Female" - layout="topleft" - left="1" - name="radio" - top="1" - width="82" /> - <radio_item - height="16" - label="Male" - layout="topleft" - left_delta="0" - name="radio2" - top_delta="16" - width="82" /> - </radio_group> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="26" - name="title" - top="8" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Shape: - </text> - <button - follows="left|top" - height="24" - label="Create New Shape" - label_selected="Create New Shape" - layout="topleft" - left="8" - name="Create New" - top="104" - width="120" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Skin" - layout="topleft" - left_delta="0" - name="Skin" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Skin Color" - label_selected="Skin Color" - layout="topleft" - left_delta="0" - name="Skin Color" - top_pad="41" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Face Detail" - label_selected="Face Detail" - layout="topleft" - left_delta="0" - name="Face Detail" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Makeup" - label_selected="Makeup" - layout="topleft" - left_delta="0" - name="Makeup" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Body Detail" - label_selected="Body Detail" - layout="topleft" - left_delta="0" - name="Body Detail" - top_pad="16" - width="82" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="26" - name="title" - top="8" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Skin: - </text> - <texture_picker - allow_no_texture="true" - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Head Tattoos" - layout="topleft" - left="8" - name="Head Tattoos" - tool_tip="Click to choose a picture" - top="193" - width="74" /> - <texture_picker - allow_no_texture="true" - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Upper Tattoos" - layout="topleft" - left_delta="0" - name="Upper Tattoos" - tool_tip="Click to choose a picture" - top_delta="80" - width="74" /> - <texture_picker - allow_no_texture="true" - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Lower Tattoos" - layout="topleft" - left_delta="0" - name="Lower Tattoos" - tool_tip="Click to choose a picture" - top_delta="80" - width="74" /> - <button - follows="left|top" - height="24" - label="Create New Skin" - label_selected="Create New Skin" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-249" - width="120" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Hair" - layout="topleft" - left_delta="0" - name="Hair" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Color" - label_selected="Color" - layout="topleft" - left_delta="0" - name="Color" - top_pad="41" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Style" - label_selected="Style" - layout="topleft" - left_delta="0" - name="Style" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Eyebrows" - label_selected="Eyebrows" - layout="topleft" - left_delta="0" - name="Eyebrows" - top_pad="16" - width="82" /> - <button - follows="left|top" - font="SansSerifSmall" - height="16" - label="Facial" - label_selected="Facial" - layout="topleft" - left_delta="0" - name="Facial" - top_pad="16" - width="82" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="26" - name="title" - top="8" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Hair: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Texture" - layout="topleft" - left="8" - name="Texture" - tool_tip="Click to choose a picture" - top="193" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Hair" - label_selected="Create New Hair" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-89" - width="120" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Eyes" - layout="topleft" - left_delta="0" - name="Eyes" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Eyes: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Iris" - layout="topleft" - left="8" - name="Iris" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Eyes" - label_selected="Create New Eyes" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="39" - width="120" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <placeholder - label="Clothes" - layout="topleft" - name="clothes_placeholder" /> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Shirt" - layout="topleft" - left_delta="0" - name="Shirt" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left_delta="0" - name="Fabric" - tool_tip="Click to choose a picture" - top_pad="41" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Shirt" - label_selected="Create New Shirt" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="26" - name="title" - top="8" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Shirt: - </text> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Pants" - layout="topleft" - left_delta="0" - name="Pants" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left_delta="0" - name="Fabric" - tool_tip="Click to choose a picture" - top_pad="41" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Pants" - label_selected="Create New Pants" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="26" - name="title" - top="8" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Pants: - </text> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Shoes" - layout="topleft" - left_delta="0" - name="Shoes" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Shoes: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Shoes" - label_selected="Create New Shoes" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Socks" - layout="topleft" - left_delta="0" - name="Socks" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Socks: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Socks" - label_selected="Create New Socks" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Jacket" - layout="topleft" - left_delta="0" - name="Jacket" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Jacket: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Upper Fabric" - layout="topleft" - left="8" - name="Upper Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Lower Fabric" - layout="topleft" - left_delta="0" - name="Lower Fabric" - tool_tip="Click to choose a picture" - top_delta="80" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Jacket" - label_selected="Create New Jacket" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-121" - width="140" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="182" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Gloves" - layout="topleft" - left_delta="0" - name="Gloves" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Gloves: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Gloves" - label_selected="Create New Gloves" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="130" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Undershirt" - layout="topleft" - left_delta="0" - name="Undershirt" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Undershirt: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Undershirt" - label_selected="Create New Undershirt" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="160" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Underpants" - layout="topleft" - left_delta="0" - name="Underpants" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Underpants: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Underpants" - label_selected="Create New Underpants" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="160" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Skirt" - layout="topleft" - left_delta="0" - name="Skirt" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="not worn instructions" - top_pad="8" - 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. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="117" - width="100"> - Skirt: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Fabric" - layout="topleft" - left="8" - name="Fabric" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - follows="left|top" - height="80" - label="Color/Tint" - layout="topleft" - left_delta="0" - name="Color/Tint" - tool_tip="Click to open Color Picker" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Skirt" - label_selected="Create New Skirt" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-41" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="0" - name="Take Off" - top_pad="102" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="123" - name="Save" - top="458" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Alpha" - layout="topleft" - left_delta="0" - name="Alpha" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="-2" - name="not worn instructions" - top_delta="2" - width="373"> - Put on a new alpha mask by dragging one from your inventory -to your avatar. Alternately, you create a new one from -scratch and wear it. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="119" - width="100"> - Alpha: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Lower Alpha" - layout="topleft" - left="8" - name="Lower Alpha" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <check_box - control_name="LowerAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="lower alpha texture invisible" - top_delta="4" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Upper Alpha" - layout="topleft" - left="8" - name="Upper Alpha" - tool_tip="Click to choose a picture" - top="145" - width="64" /> - <check_box - control_name="UpperAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="upper alpha texture invisible" - top_delta="4" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Head Alpha" - layout="topleft" - left="8" - name="Head Alpha" - tool_tip="Click to choose a picture" - top="225" - width="64" /> - <check_box - control_name="HeadAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="head alpha texture invisible" - top_delta="4" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Eye Alpha" - layout="topleft" - left="8" - name="Eye Alpha" - tool_tip="Click to choose a picture" - top="305" - width="64" /> - <check_box - control_name="Eye AlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="eye alpha texture invisible" - top_delta="4" - width="16" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Hair Alpha" - layout="topleft" - left="8" - name="Hair Alpha" - tool_tip="Click to choose a picture" - top="385" - width="64" /> - <check_box - control_name="HairAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left_pad="6" - name="hair alpha texture invisible" - top_delta="4" - width="16" /> - <button - follows="left|top" - height="24" - label="Create New Alpha" - label_selected="Create New Alpha" - layout="topleft" - left="8" - name="Create New" - top="104" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="-4" - name="Take Off" - top_pad="332" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="37" - name="Save" - top_delta="-2" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="481" - label="Tattoo" - layout="topleft" - left_delta="0" - name="Tattoo" - top_delta="0" - width="389"> - <icon - follows="top|right" - height="16" - image_name="icon_lock.tga" - layout="topleft" - left="333" - mouse_opaque="true" - name="square" - top="5" - width="16" /> - <icon - height="16" - layout="topleft" - left_delta="-325" - mouse_opaque="true" - top_delta="3" - width="16" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="2" - name="title" - top_delta="0" - width="355"> - [DESC] - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_no_modify" - top_delta="0" - width="355"> - [DESC]: cannot modify - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_loading" - top_delta="0" - width="355"> - [DESC]: loading... - </text> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="title_not_worn" - top_delta="0" - width="355"> - [DESC]: not worn - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="14" - layout="topleft" - left="8" - name="path" - top="24" - width="373"> - Located in [PATH] - </text> - <spinner - decimal_digits="0" - follows="left|top|right" - height="16" - increment="1" - initial_value="0" - label="Item" - label_width="30" - layout="topleft" - left_delta="2" - max_val="5" - name="index" - text_enabled_color="110, 15, 15, 255" - top_pad="6" - width="87" /> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="-2" - name="not worn instructions" - top_delta="2" - width="373"> - Put on a new tattoo by dragging one from your inventory -to your avatar. Alternately, you create a new one from -scratch and wear it. - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="28" - layout="topleft" - left_delta="0" - name="no modify instructions" - top_delta="0" - width="373"> - You do not have permission to modify this wearable. - </text> - <text - type="string" - length="1" - bottom="486" - follows="left|top|right" - font="SansSerif" - halign="right" - height="28" - layout="topleft" - name="Item Action Label" - right="119" - width="100"> - Tattoo: - </text> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Head Tattoo" - layout="topleft" - left="8" - name="Head Tattoo" - tool_tip="Click to choose a picture" - top="65" - width="64" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Upper Tattoo" - layout="topleft" - left_delta="0" - name="Upper Tattoo" - tool_tip="Click to choose a picture" - top_delta="80" - width="64" /> - <texture_picker - can_apply_immediately="true" - default_image_name="Default" - follows="left|top" - height="80" - label="Lower Tattoo" - layout="topleft" - left_delta="0" - name="Lower Tattoo" - tool_tip="Click to choose a picture" - top_delta="80" - width="64" /> - <button - follows="left|top" - height="24" - label="Create New Tattoo" - label_selected="Create New Tattoo" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-121" - width="120" /> - <button - follows="left|top" - height="20" - label="Take Off" - label_selected="Take Off" - layout="topleft" - left_delta="-4" - name="Take Off" - top_pad="332" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="37" - name="Save" - top_delta="-2" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Save As..." - label_selected="Save As..." - layout="topleft" - left_pad="6" - name="Save As" - top_delta="0" - width="82" /> - <button - follows="right|bottom" - height="20" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="6" - name="Revert" - top_delta="0" - width="82" /> - </panel> - </tab_container> - <scroll_container - follows="left|top|right|bottom" - height="382" - layout="topleft" - left="197" - mouse_opaque="false" - name="panel_container" - top="94" - width="292"> - <scrolling_panel_list - follows="left|bottom" - layout="topleft" - name="panel_list" /> - </scroll_container> - <button - bottom="536" - follows="right|bottom" - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - name="Cancel" - right="-10" - width="100" /> - <button - bottom="536" - follows="right|bottom" - height="20" - label="OK" - label_selected="OK" - layout="topleft" - name="Ok" - right="-116" - width="100" /> - <button - follows="left|bottom" - height="20" - label="Make Outfit..." - label_selected="Make Outfit..." - layout="topleft" - left_delta="-178" - name="Make Outfit" - top_delta="0" - width="100" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 9ca7172f81..65e2462ef8 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="275" layout="topleft" name="Day Cycle Floater" + help_topic="day_cycle_floater" save_rect="true" - title="Day Cycle Editor" - width="646"> + title="DAY CYCLE EDITOR" + width="658"> <tab_container follows="left|top" height="255" @@ -14,7 +16,7 @@ name="Day Cycle Tabs" tab_position="top" top="20" - width="644"> + width="656"> <panel border="true" follows="left|top|right|bottom" @@ -25,17 +27,7 @@ mouse_opaque="false" name="Day Cycle" top="0" - width="642"> - <button - follows="left|top" - font="SansSerifSmall" - height="15" - label="?" - layout="topleft" - left="612" - name="WLDayCycleHelp" - top="3" - width="18" /> + width="654"> <multi_slider can_edit_text="true" control_name="WLTimeSlider" @@ -73,11 +65,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12am" follows="left|top|right" - height="6" + height="16" layout="topleft" left="8" name="WL12am" @@ -88,11 +78,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL3am" @@ -103,11 +91,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL6am" @@ -118,11 +104,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9am" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL9amHash" @@ -133,11 +117,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL12pmHash" @@ -148,11 +130,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL3pm" @@ -163,11 +143,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL6pm" @@ -178,11 +156,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9pm" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL9pm" @@ -193,11 +169,9 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12am2" follows="left|top|right" - height="6" + height="16" layout="topleft" left_pad="10" name="WL12am2" @@ -208,9 +182,7 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12amHash" follows="left|top|right" font="SansSerif" height="14" @@ -218,135 +190,119 @@ left="20" name="WL12amHash" top="54" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3amHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL3amHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6amHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL6amHash" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9amHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL9amHash2" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12pmHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL12pmHash2" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL3pmHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL3pmHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL6pmHash" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL6pmHash" top_delta="-3" - width="4"> + width="6"> | </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL9pmHash" follows="left|top|right" font="SansSerif" height="11" layout="topleft" - left_pad="61" + left_pad="59" name="WL9pmHash" top_delta="3" - width="4"> + width="6"> I </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WL12amHash2" follows="left|top|right" font="SansSerif" height="14" layout="topleft" - left_pad="61" + left_pad="59" name="WL12amHash2" top_delta="-3" - width="4"> + width="6"> | </text> <button @@ -354,10 +310,10 @@ label="Add Key" label_selected="Add Key" layout="topleft" - left="550" + left="555" name="WLAddKey" - top="20" - width="80" /> + top="30" + width="96" /> <button height="20" label="Delete Key" @@ -366,13 +322,11 @@ left_delta="0" name="WLDeleteKey" top_pad="5" - width="80" /> + width="96" /> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -380,15 +334,13 @@ left="20" name="WLCurKeyFrameText" top="104" - width="150"> + width="235"> Key Frame Settings: </text> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" @@ -396,7 +348,7 @@ left="30" name="WLCurKeyTimeText" top="124" - width="100"> + width="105"> Key Time: </text> <spinner @@ -407,13 +359,13 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="35" layout="topleft" - left_delta="0" + left_delta="20" max_val="100" name="WLCurKeyHour" top_pad="4" - width="70" /> + width="74" /> <spinner control_name="WLCurKeyMin" decimal_digits="0" @@ -422,19 +374,17 @@ increment="5" initial_value="0" label="Min" - label_width="20" + label_width="45" layout="topleft" left_pad="5" max_val="55" name="WLCurKeyMin" top_delta="0" - width="60" /> + width="85" /> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="WLCurKeyTimeText" follows="left|top|right" font="SansSerif" height="16" @@ -442,7 +392,7 @@ left="30" name="WLCurKeyTimeText2" top="169" - width="120"> + width="185"> Key Preset: </text> <combo_box @@ -452,7 +402,7 @@ left_delta="0" name="WLKeyPresets" top_pad="7" - width="155" /> + width="205" /> <view_border bevel_style="none" follows="top|left" @@ -460,18 +410,16 @@ layout="topleft" left="12" top="101" - width="190" /> + width="240" /> <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" layout="topleft" - left="220" + left_pad="15" name="DayCycleText" top="114" width="120"> @@ -489,16 +437,14 @@ <text type="string" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="0" name="DayCycleText2" - top_pad="9" + top_pad="17" width="120"> Length of Cycle: </text> @@ -510,13 +456,13 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="33" layout="topleft" - left_delta="0" + left_delta="-3" max_val="100" name="WLLengthOfDayHour" top_pad="4" - width="70" /> + width="74" /> <spinner control_name="WLLengthOfDayMin" decimal_digits="0" @@ -525,13 +471,13 @@ increment="1" initial_value="0" label="Min" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDayMin" top_delta="0" - width="60" /> + width="65" /> <spinner control_name="WLLengthOfDaySec" decimal_digits="0" @@ -540,65 +486,64 @@ increment="1" initial_value="24" label="Sec" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDaySec" top_delta="0" - width="60" /> + width="65"/> <text type="string" + halign="right" length="1" - bg_visible="true" border_visible="true" - control_name="DayCycleText" follows="left|top|right" font="SansSerif" height="16" layout="topleft" - left="310" + left_delta="-23" name="DayCycleText3" top="114" - width="120"> - Preview: + width="85"> + Preview : </text> <button height="20" label="Play" label_selected="Play" layout="topleft" - left_delta="0" + left="480" name="WLAnimSky" top_pad="5" - width="50" /> + width="83" /> <button height="20" label="Stop!" label_selected="Stop" layout="topleft" - left_pad="5" + left_pad="4" name="WLStopAnimSky" top_delta="0" - width="50" /> + width="83" /> <button height="20" label="Use Estate Time" label_selected="Go to Estate Time" layout="topleft" - left_pad="5" + left="480" name="WLUseLindenTime" - top_delta="0" - width="140" /> + top_pad="9" + width="170" /> <button height="20" label="Save Test Day" label_selected="Save Test Day" layout="topleft" - left="480" + left_delta="0" name="WLSaveDayCycle" - top="175" - width="150" /> + top_pad="9" + width="170" /> <button height="20" label="Load Test Day" @@ -606,8 +551,8 @@ layout="topleft" left_delta="0" name="WLLoadDayCycle" - top_pad="5" - width="150" /> + top_pad="3" + width="170" /> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_device_settings.xml b/indra/newview/skins/default/xui/en/floater_device_settings.xml deleted file mode 100644 index fa0cce3795..0000000000 --- a/indra/newview/skins/default/xui/en/floater_device_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - height="260" - layout="topleft" - name="floater_device_settings" - title="Voice Chat Device Settings" - width="405"> - <panel - bottom="260" - filename="panel_audio_device.xml" - layout="topleft" - left="2" - name="device_settings" - right="-5" - top="20" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 8bb67d0d4b..14f9e2db95 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="150" layout="topleft" name="Environment Editor Floater" + help_topic="environment_editor_floater" save_rect="true" - title="Environment Editor" + title="ENVIRONMENT EDITOR" width="600"> <floater.string name="timeStr"> @@ -96,7 +98,6 @@ Water Color </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.5 0.5 0.5 1" follows="left|top" @@ -104,7 +105,7 @@ layout="topleft" left="390" name="EnvWaterColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text @@ -134,41 +135,29 @@ width="210" /> <button follows="left|top" - font="SansSerifSmall" - height="20" + height="23" label="Use Estate Time" layout="topleft" - left="8" + left="10" name="EnvUseEstateTimeButton" top="120" width="137" /> <button follows="left|top" - font="SansSerifSmall" - height="20" + height="23" label="Advanced Sky" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedSkyButton" top_delta="0" width="137" /> <button follows="left|top" - font="SansSerifSmall" - height="20" + height="23" label="Advanced Water" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedWaterButton" top_delta="0" width="137" /> - <button - follows="left|top" - height="18" - label="?" - layout="topleft" - left="570" - name="EnvSettingsHelpButton" - top="22" - width="18" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml new file mode 100644 index 0000000000..9864083442 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -0,0 +1,311 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + follows="all" + height="350" + help_topic="event_details" + label="Event" + layout="topleft" + name="Event" + title="EVENT DETAILS" + width="330"> + <floater.string + name="none"> + none + </floater.string> + <floater.string + name="notify"> + Notify + </floater.string> + <floater.string + name="dont_notify"> + Don't Notify + </floater.string> + <floater.string + name="moderate"> + Moderate + </floater.string> + <floater.string + name="adult"> + Adult + </floater.string> + <floater.string + name="general"> + General + </floater.string> + <floater.string + name="unknown"> + Unknown + </floater.string> + <layout_stack + name="layout" + orientation="vertical" + follows="all" + layout="topleft" + left="0" + top="0" + height="350" + width="330" + border_size="0"> + <layout_panel + name="profile_stack" + follows="top|left" + layout="topleft" + top="0" + left="0" + height="305" + width="330"> + <text + follows="top|left|right" + font="SansSerifLarge" + text_color="white" + height="17" + layout="topleft" + left="10" + name="event_name" + top="5" + use_ellipses="true" + width="310"> + Nameless Event...of Doom! De doom! Doom doom. + </text> + <text + type="string" + length="1" + follows="top|left" + height="13" + text_color="LtGray_50" + layout="topleft" + left="25" + name="event_category" + width="300"> + (no category) + </text> + + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="7" + name="event_runby_label" + width="90"> + Run by: + </text> + <text + follows="left|top" + height="20" + initial_value="(retrieving)" + layout="topleft" + left_pad="0" + link="true" + name="event_runby" + top_delta="0" + use_ellipses="true" + width="240" /> + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_date_label" + width="90"> + Date: + </text> + <text + type="string" + length="1" + left_pad="0" + height="17" + top_delta="0" + follows="top|left" + layout="topleft" + name="event_date" + width="240"> + 10/10/2010 + </text> + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_duration_label" + width="90"> + Duration: + </text> + <text + type="string" + height="14" + length="1" + left_pad="0" + follows="top|left" + layout="topleft" + name="event_duration" + top_delta="0" + width="240"> + 1 hour + </text> + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_covercharge_label" + width="90"> + Cover charge: + </text> + <text + type="string" + follows="left|top" + height="16" + layout="topleft" + left_pad="0" + name="event_cover" + visible="true" + width="240" + top_delta="0"> + Free + </text> + <text + type="string" + length="1" + follows="top|left" + layout="topleft" + left="10" + top_pad="5" + name="event_location_label" + width="90"> + Location: + </text> + <text + type="string" + length="1" + height="20" + left_pad="0" + follows="top|left" + layout="topleft" + name="event_location" + use_ellipses="true" + top_delta="0" + value="SampleParcel, Name Long (145, 228, 26)" + width="240" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left="10" + name="rating_icon_pg" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_M_Dark" + layout="topleft" + left="10" + name="rating_icon_m" + top_delta="0" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_R_Dark" + layout="topleft" + left="10" + name="rating_icon_r" + top_delta="0" + width="18" /> + <text + follows="left|top" + height="16" + layout="topleft" + left_pad="12" + name="rating_label" + top_delta="3" + value="Rating:" + width="90" /> + <text + follows="left|right|top" + height="16" + layout="topleft" + left_pad="2" + name="rating_value" + top_delta="0" + value="unknown" + width="240" /> + <expandable_text + follows="left|top|right" + height="65" + layout="topleft" + left="6" + name="event_desc" + width="322"> + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text> + </layout_panel> + <layout_panel + follows="left|right" + height="24" + layout="topleft" + mouse_opaque="false" + name="button_panel" + top="0" + left="0" + user_resize="false"> + <button + follows="left|top" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left="6" + name="create_event_btn" + tool_tip="Create Event" + width="18" /> + <button + follows="left|top" + height="18" + image_selected="MinusItem_Press" + image_unselected="MinusItem_Off" + image_disabled="MinusItem_Disabled" + layout="topleft" + visible="false" + left="6" + top_pad="-7" + name="god_delete_event_btn" + tool_tip="Delete Event" + width="18" /> + <button + follows="left|top" + height="23" + label="Notify Me" + layout="topleft" + left_pad="3" + top_delta="-12" + name="notify_btn" + width="100" /> + <button + follows="left|top" + height="23" + label="Teleport" + layout="topleft" + left_pad="5" + name="teleport_btn" + width="100" /> + <button + follows="left|top" + height="23" + label="Map" + layout="topleft" + left_pad="5" + name="map_btn" + width="85" /> + </layout_panel> + </layout_stack> + </floater> + diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 8babbaa273..3ab19ec9d9 100644 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="800" layout="topleft" min_height="175" min_width="154" name="contents" - title="Font Test" + help_topic="contents" + title="FONT TEST" width="500"> <text type="string" @@ -65,6 +67,30 @@ <text type="string" length="1" + bottom_delta="36" + follows="left|top|right" + font="SansSerifHuge" + font.style.="BOLD" + height="32" + layout="topleft" + left="16"> + SansSerifHuge style=BOLD + </text> + <text + type="string" + length="1" + bottom_delta="36" + follows="left|top|right" + font="SansSerifBold" + font.size="Huge" + height="32" + layout="topleft" + left="16"> + SansSerifBold size=Huge + </text> + <text + type="string" + length="1" bottom_delta="40" follows="left|top|right" font="Monospace" @@ -174,7 +200,7 @@ bottom_delta="20" follows="left|top|right" font="SansSerif" - font_shadow="hard" + font_shadow="none" height="16" layout="topleft" left="16"> @@ -311,6 +337,7 @@ left="16"> Helvetica size=Large style=BOLD|ITALIC </text> +<!-- <text type="string" length="1" @@ -333,4 +360,5 @@ left="16"> BogusFontName </text> +--> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index c4d024ae8b..9f5e6828d2 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="465" - layout="topleft" - min_height="200" - min_width="350" name="gestures" - title="Active Gestures" - width="350"> + help_topic="gestures" + title="GESTURES" + background_visible="true" + follows="all" + label="Places" + layout="topleft" + min_height="350" + min_width="240" + width="313"> <floater.string name="loading"> Loading... @@ -16,63 +21,111 @@ name="playing"> (Playing) </floater.string> - <text - type="string" - length="1" - bottom="30" - follows="top|left" - layout="topleft" - left="15" - name="help_label"> - Double-click a gesture to play animations and sounds. - </text> + <!-- It's used to build new name for gesture created by "Copy" menu item --> + <floater.string + name="copy_name">Copy of [COPY_NAME]</floater.string> <scroll_list - bottom_delta="390" + bottom_delta="400" draw_heading="true" - follows="top|left|bottom|right" - height="380" + follows="all" layout="topleft" - left="15" - name="gesture_list" - right="-15"> - <scroll_list.columns - label="Trigger" - name="trigger" - width="70" /> + left="0" + multi_select="true" + top="20" + name="gesture_list"> <scroll_list.columns - label="Key" - name="shortcut" - width="70" /> + label="Name" + name="name" + width="153" /> <scroll_list.columns + label="Chat" + name="trigger" + width="80" /> + <scroll_list.columns label="" name="key" width="-1" /> <scroll_list.columns - label="Name" - name="name" - width="160" /> + label="Key" + name="shortcut" + width="80" /> </scroll_list> + <panel + background_visible="true" + bevel_style="none" + top_pad="0" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="313"> + <menu_button + follows="bottom|left" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + menu_filename="menu_gesture_gear.xml" + name="gear_btn" + top="5" + tool_tip="More options" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="5" + name="new_gesture_btn" + tool_tip="Make new gesture" + top_delta="0" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="10" + image_hover_selected="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + layout="topleft" + left_pad="5" + name="activate_btn" + tool_tip="Activate/Deactivate selected gesture" + top="10" + width="10" /> + <button + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + image_disabled="TrashItem_Disabled" + layout="topleft" + name="del_btn" + right="-5" + tool_tip="Delete this gesture" + top_delta="0" + width="18" /> + </panel> <button - follows="bottom|right" - height="20" - label="New" - layout="topleft" - left_delta="0" - name="new_gesture_btn" - top_pad="10" - width="83" /> - <button - follows="bottom|right" - height="20" + follows="left|bottom" + height="23" label="Edit" layout="topleft" - left_pad="6" + left="6" name="edit_btn" - top_delta="0" + top_pad="5" width="83" /> <button - follows="bottom|right" - height="20" + follows="left|bottom" + height="23" label="Play" layout="topleft" left_pad="6" @@ -80,8 +133,8 @@ top_delta="0" width="83" /> <button - follows="bottom|right" - height="20" + follows="left|bottom" + height="23" label="Stop" layout="topleft" left_delta="0" 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 e35ab3ea49..dfe3cf4485 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="384" layout="topleft" name="godtools floater" - title="God Tools" + help_topic="godtools_floater" + title="GOD TOOLS" width="400"> <tab_container follows="left|top" @@ -22,29 +24,23 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="godtools_grid_tab" name="grid" top="16" width="398"> <button follows="left|top" height="20" - label="Kick all users" - label_selected="Kick all users" - layout="topleft" - left="10" - name="Kick all users" - top="8" - width="100" /> - <button - follows="left|top" - height="20" label="Flush This Region's Map Visibility Caches" label_selected="Flush This Region's Map Visibility Caches" layout="topleft" - left_delta="0" + left="10" name="Flush This Region's Map Visibility Caches" - top_pad="8" - width="250" /> + top_pad="30" + width="350"> + <button.commit_callback + function="GridTools.FlushMapVisibilityCaches" /> + </button> </panel> <panel border="true" @@ -54,6 +50,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="godtools_region_tab" name="region" top_delta="0" width="398"> @@ -64,76 +61,97 @@ height="10" layout="topleft" left="10" - name="Sim Name:" - top="10" - width="50"> - Sim Name: + name="Region Name:" + top="12" + width="80"> + Region Name: </text> <line_editor border_style="line" border_thickness="1" follows="left|top|right" - height="16" + height="20" layout="topleft" - left_pad="10" + left_pad="0" max_length="63" name="region name" top_delta="0" - width="208" /> + width="250"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <check_box height="16" label="Prelude" layout="topleft" left="10" name="check prelude" - tool_tip="Set this to make the region a prelude." - top="30" - width="180" /> + tool_tip="Set this to make the region a prelude" + top_pad="10" + width="180"> + <check_box.commit_callback + function="RegionTools.ChangePrelude" /> + </check_box> <check_box height="16" label="Fixed Sun" layout="topleft" left_delta="0" name="check fixed sun" - tool_tip="Fix the sun position (like in Region/Estate > Terrain." + tool_tip="Fix the sun position (like in Region/Estate > Terrain" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Reset Home On Teleport" 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" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Visible" layout="topleft" left_delta="0" name="check visible" - tool_tip="Set this to make the region visible to non-gods." + tool_tip="Set this to make the region visible to non-gods" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Damage" layout="topleft" left_delta="0" name="check damage" - tool_tip="Set this to enable damage in this region." + tool_tip="Set this to enable damage in this region" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Block Traffic Tracking" layout="topleft" left_delta="0" name="block dwell" - tool_tip="Set this to make the region not compute traffic." + tool_tip="Set this to make the region not compute traffic" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Block Terraform" @@ -142,52 +160,62 @@ name="block terraform" tool_tip="Set this to disallow people terraforming their land" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Sandbox" layout="topleft" left_delta="0" name="is sandbox" - tool_tip="Toggle whether this is a sandbox region." + tool_tip="Toggle whether this is a sandbox region" top_pad="4" - width="180" /> + width="180"> + <check_box.commit_callback + function="RegionTools.ChangeAnything" /> + </check_box> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Bake Terrain" label_selected="Bake Terrain" layout="topleft" - left_delta="-2" + left="12" name="Bake Terrain" - tool_tip="Save the current terrain as default." + tool_tip="Save the current terrain as default" top_pad="32" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.BakeTerrain" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Revert Terrain" label_selected="Revert Terrain" layout="topleft" - left_delta="0" name="Revert Terrain" - tool_tip="Replace the current terrain with default." - top_pad="4" - width="110" /> + tool_tip="Replace the current terrain with default" + top_pad="10" + width="110"> + <button.commit_callback + function="RegionTools.RevertTerrain" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Swap Terrain" label_selected="Swap Terrain" layout="topleft" - left_delta="0" name="Swap Terrain" - tool_tip="Swap current terrain with default." - top_pad="4" - width="110" /> + tool_tip="Swap current terrain with default" + top_pad="10" + width="110"> + <button.commit_callback + function="RegionTools.SwapTerrain" /> + </button> <text type="string" length="1" @@ -197,7 +225,7 @@ layout="topleft" left="200" name="estate id" - top="30" + top="40" width="190"> Estate ID: </text> @@ -221,7 +249,7 @@ layout="topleft" left="200" name="parent id" - top="50" + top_pad="4" width="190"> Parent ID: </text> @@ -236,7 +264,10 @@ name="parentestate" tool_tip="This is the parent estate for this region" top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <text type="string" length="1" @@ -245,7 +276,7 @@ layout="topleft" left="200" name="Grid Pos: " - top="70" + top_pad="4" width="190"> Grid Pos: </text> @@ -260,7 +291,10 @@ name="gridposx" tool_tip="This is the grid x position for this region" top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <line_editor border_style="line" border_thickness="1" @@ -272,7 +306,10 @@ name="gridposy" tool_tip="This is the grid y position for this region" top_delta="0" - width="40" /> + width="40"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <text type="string" length="1" @@ -281,8 +318,8 @@ layout="topleft" left="200" name="Redirect to Grid: " - top="90" - width="190"> + top_pad="4" + width="88"> Redirect to Grid: </text> <line_editor @@ -291,11 +328,13 @@ follows="top|right" height="16" layout="topleft" - left_delta="88" + left_pad="0" max_length="10" name="redirectx" - top_delta="0" - width="50" /> + width="50"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> <line_editor border_style="line" border_thickness="1" @@ -306,41 +345,35 @@ max_length="10" name="redirecty" top_delta="0" - width="40" /> - <spinner - follows="top|right" - height="16" - initial_value="1" - layout="topleft" - left="308" - max_val="4" - name="billable factor" - top="110" - width="80" /> - <text + width="40"> + <line_editor.commit_callback + function="RegionTools.ChangeAnything" /> + </line_editor> + <text type="string" length="1" follows="left|top" font="SansSerif" height="16" layout="topleft" - left_delta="-108" + left="200" name="billable factor text" - top_delta="0" + top_pad="10" width="110"> Billable Factor: </text> - <spinner + <spinner follows="top|right" height="16" - increment="1" initial_value="1" layout="topleft" - left="308" - max_val="100" - name="land cost" - top="130" - width="80" /> + max_val="4" + name="billable factor" + left_pad="0" + width="80"> + <spinner.commit_callback + function="RegionTools.ChangeAnything" /> + </spinner> <text type="string" length="1" @@ -348,60 +381,82 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-108" + left="200" name="land cost text" - top_delta="0" + top_pad="10" width="110"> - L$ per sq. meter: + L$ per m²: </text> + <spinner + follows="top|right" + height="16" + increment="1" + initial_value="1" + layout="topleft" + left_pad="0" + max_val="100" + name="land cost" + width="80"> + <spinner.commit_callback + function="RegionTools.ChangeAnything" /> + </spinner> + <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Refresh" label_selected="Refresh" layout="topleft" left="278" name="Refresh" - tool_tip="Click here to refresh the above information." - top="150" - width="110" /> + tool_tip="Click here to refresh the above information" + top_pad="10" + width="110"> + <button.commit_callback + function="RegionTools.Refresh" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Apply" label_selected="Apply" layout="topleft" - left_delta="0" + left="278" name="Apply" - tool_tip="Click here to apply any changes from above." - top_pad="36" - width="110" /> + tool_tip="Click here to apply any changes from above" + top="317" + width="110"> + <button.commit_callback + function="RegionTools.ApplyChanges" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Select Region" label_selected="Select Region" layout="topleft" - left="128" + left="130" name="Select Region" - tool_tip="Select the whole region with the land tool." + tool_tip="Select the whole region with the land tool" top="238" - width="110" /> + width="110"> + <button.commit_callback + function="RegionTools.SelectRegion" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Autosave now" label_selected="Autosave now" layout="topleft" left_delta="0" name="Autosave now" - tool_tip="Save gzipped state to autosave directory." - top_pad="4" - width="110" /> + tool_tip="Save gzipped state to autosave directory" + top_pad="10" + width="110"> + <button.commit_callback + function="RegionTools.SaveState" /> + </button> </panel> <panel border="true" @@ -411,6 +466,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="godtools_objects_tab" name="objects" top_delta="0" width="398"> @@ -425,10 +481,10 @@ height="10" layout="topleft" left="10" - name="Sim Name:" + name="Region Name:" top="10" - width="50"> - Sim Name: + width="80"> + Region Name: </text> <text type="string" @@ -450,7 +506,10 @@ name="disable scripts" tool_tip="Set this to disable all scripts in this region" top="30" - width="110" /> + width="110"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Disable Collisions" @@ -459,7 +518,10 @@ name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region" top_delta="0" - width="121" /> + width="121"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <check_box height="16" label="Disable Physics" @@ -468,31 +530,38 @@ name="disable physics" tool_tip="Set this to disable all physics in this region" top_delta="0" - width="130" /> + width="130"> + <check_box.commit_callback + function="ObjectTools.ChangeAnything" /> + </check_box> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Apply" label_selected="Apply" layout="topleft" left="278" name="Apply" - tool_tip="Click here to apply any changes from above." + tool_tip="Click here to apply any changes from above" top="54" - width="110" /> - <button + width="110"> + <button.commit_callback + function="ObjectTools.ApplyChanges" /> + </button> + <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Set Target" label_selected="Set Target" layout="topleft" left="8" name="Set Target" - tool_tip="Set the target avatar for object deletion." + tool_tip="Set the target avatar for object deletion" top="78" - width="110" /> + width="110"> + <button.commit_callback + function="ObjectTools.Set" /> + </button> <text type="string" length="1" @@ -507,8 +576,7 @@ </text> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Delete Target's Scripted Objects On Others Land" label_selected="Delete Target's Scripted Objects On Others Land" layout="topleft" @@ -516,11 +584,13 @@ name="Delete Target's Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned." top="126" - width="380" /> + width="380"> + <button.commit_callback + function="ObjectTools.DeletePublicOwnedBy" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Delete Target's Scripted Objects On *Any* Land" label_selected="Delete Target's Scripted Objects On *Any* Land" layout="topleft" @@ -528,11 +598,13 @@ name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned." top_pad="28" - width="380" /> + width="380"> + <button.commit_callback + function="ObjectTools.DeleteAllScriptedOwnedBy" /> + </button> <button follows="top|right" - font="SansSerifSmall" - height="20" + height="22" label="Delete *ALL* Of Target's Objects" label_selected="Delete *ALL* Of Target's Objects" layout="topleft" @@ -540,43 +612,52 @@ name="Delete *ALL* Of Target's Objects" tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned." top_pad="28" - width="380" /> - <button + width="380"> + <button.commit_callback + function="ObjectTools.DeleteAllOwnedBy" /> + </button> + <button follows="top|right" - font="SansSerifSmall" height="20" label="Get Top Colliders" label_selected="Get Top Colliders" layout="topleft" - left_delta="0" + left="12" name="Get Top Colliders" - tool_tip="Gets list of objects experiencing the most narrowphase callbacks." - top_pad="28" - width="110" /> + tool_tip="Gets list of objects experiencing the most narrowphase callbacks" + top_pad="20" + width="130"> + <button.commit_callback + function="ObjectTools.GetTopColliders" /> + </button> <button follows="top|right" - font="SansSerifSmall" height="20" label="Get Top Scripts" label_selected="Get Top Scripts" layout="topleft" left_delta="0" name="Get Top Scripts" - tool_tip="Gets list of objects spending the most time running scripts." - top_pad="4" - width="110" /> + tool_tip="Gets list of objects spending the most time running scripts" + top_pad="5" + width="130"> + <button.commit_callback + function="ObjectTools.GetTopScripts" /> + </button> <button follows="top|right" - font="SansSerifSmall" height="20" label="Scripts digest" label_selected="Scripts digest" layout="topleft" left_delta="0" name="Scripts digest" - tool_tip="Gets a list of all scripts and number of occurences of each." - top_pad="4" - width="110" /> + tool_tip="Gets a list of all scripts and number of occurences of each" + top_pad="5" + width="130" > + <button.commit_callback + function="ObjectTools.GetScriptDigest" /> + </button> </panel> <panel border="true" @@ -585,6 +666,7 @@ label="Request" layout="topleft" left_delta="0" + help_topic="godtools_request_tab" name="request" top_delta="0" width="398"> @@ -592,16 +674,16 @@ type="string" length="1" follows="left|top" - height="10" + height="22" layout="topleft" left="10" name="Destination:" - top="4" + top="12" width="80"> Destination: </text> <combo_box - height="16" + height="22" layout="topleft" left_pad="10" name="destination" @@ -609,26 +691,28 @@ width="290"> <combo_box.item label="Selection" + name="item1" value="Selection" /> <combo_box.item label="Agent Region" + name="item2" value="Agent Region" /> </combo_box> <text type="string" length="1" follows="left|top" - height="10" + height="22" layout="topleft" left="10" name="Request:" - top="28" + top_pad="10" width="80"> Request: </text> <combo_box allow_text_entry="true" - height="16" + height="22" layout="topleft" left_pad="10" name="request" @@ -636,15 +720,19 @@ width="290"> <combo_box.item label="colliders <steps>" + name="item1" value="colliders <steps>" /> <combo_box.item label="scripts <count>,<optional pattern>" + name="item2" value="scripts <count>,<optional pattern>" /> <combo_box.item label="objects <pattern>" + name="item3" value="objects <pattern>" /> <combo_box.item label="rez <asset_id>" + name="item4" value="rez <asset_id>" /> </combo_box> <text @@ -655,7 +743,7 @@ layout="topleft" left="10" name="Parameter:" - top="52" + top_pad="10" width="80"> Parameter: </text> @@ -663,7 +751,7 @@ border_style="line" border_thickness="1" follows="left|top" - height="16" + height="22" layout="topleft" left_pad="10" max_length="63" @@ -678,8 +766,11 @@ layout="topleft" left="10" name="Make Request" - top="96" - width="100" /> + top_pad="10" + width="140"> + <button.commit_callback + function="GodTools.Request" /> + </button> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index f0e2911fd8..27f8b4bb39 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="224" layout="topleft" name="Hardware Settings Floater" - title="Hardware Settings" - width="500"> + help_topic="hardware_settings_floater" + title="HARDWARE SETTINGS" + width="615"> <text type="string" length="1" @@ -13,8 +15,8 @@ layout="topleft" left="10" name="Filtering:" - top="30" - width="128"> + top="20" + width="188"> Filtering: </text> <check_box @@ -34,34 +36,39 @@ layout="topleft" left="10" name="Antialiasing:" - top="49" - width="128"> + top_pad="7" + width="188"> Antialiasing: </text> <combo_box control_name="RenderFSAASamples" - height="16" + height="22" initial_value="false" label="Antialiasing" layout="topleft" left_pad="10" name="fsaa" top_delta="0" - width="64"> + width="130"> <combo_box.item label="Disabled" + name="FSAADisabled" value="0" /> <combo_box.item label="2x" + name="2x" value="2" /> <combo_box.item label="4x" + name="4x" value="4" /> <combo_box.item label="8x" + name="8x" value="8" /> <combo_box.item label="16x" + name="16x" value="16" /> </combo_box> <spinner @@ -72,13 +79,13 @@ increment="0.01" initial_value="1" label="Gamma:" - label_width="138" + label_width="198" layout="topleft" left="10" max_val="2" name="gamma" - top="70" - width="202" /> + top_pad="7" + width="262" /> <text type="string" length="1" @@ -88,19 +95,19 @@ left_pad="10" name="(brightness, lower is brighter)" top_delta="2" - width="315"> - (brightness, lower is brighter, 0=use default) + width="385"> + (0 = default brightness, lower = brighter) </text> <text type="string" length="1" follows="left|top" - height="12" + height="16" layout="topleft" left="10" name="Enable VBO:" - top="92" - width="128"> + top_pad="10" + width="188"> Enable VBO: </text> <check_box @@ -112,47 +119,46 @@ left_pad="10" name="vbo" tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." - top_delta="1" width="315" /> <slider control_name="TextureMemory" decimal_digits="0" follows="left|top" - height="16" + height="20" increment="16" initial_value="32" label="Texture Memory (MB):" - label_width="135" + label_width="195" layout="topleft" left="10" max_val="4096" - name="GrapicsCardTextureMemory" - tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." - top="114" - width="300" /> + name="GraphicsCardTextureMemory" + tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry." + top_pad="10" + width="360" /> <spinner control_name="RenderFogRatio" decimal_digits="1" follows="left|top" - height="16" + height="22" initial_value="4" label="Fog Distance Ratio:" - label_width="138" + label_width="198" layout="topleft" left_delta="0" max_val="10" min_val="0.5" name="fog" - top_pad="8" - width="202" /> + top_pad="7" + width="262" /> <button follows="right|bottom" - height="20" + height="22" label="OK" label_selected="OK" layout="topleft" - left="-110" + left="-102" name="OK" - top="194" + top="192" width="90" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml new file mode 100644 index 0000000000..837923bcf6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="600" + layout="topleft" + min_height="150" + min_width="500" + name="floater_help_browser" + help_topic="floater_help_browser" + save_rect="true" + single_instance="true" + title="HELP BROWSER" + width="650"> + <floater.string + name="loading_text"> + Loading... + </floater.string> + <floater.string + name="done_text"> + </floater.string> + <layout_stack + bottom="600" + follows="left|right|top|bottom" + layout="topleft" + left="5" + orientation="vertical" + name="stack1" + top="20" + width="640"> + <layout_panel + layout="topleft" + left_delta="0" + top_delta="0" + name="external_controls" + user_resize="false" + width="620"> + <web_browser + trusted_content="true" + bottom="-25" + follows="left|right|top|bottom" + layout="topleft" + left="0" + name="browser" + top="0" + height="610" + width="620" /> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="2" + name="status_text" + top_pad="5" + width="150" /> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml index f62b7eece0..99a6a95828 100644 --- a/indra/newview/skins/default/xui/en/floater_hud.xml +++ b/indra/newview/skins/default/xui/en/floater_hud.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="292" layout="topleft" name="floater_hud" - title="Tutorial" + help_topic="floater_hud" + save_rect="true" + save_visibility="true" + title="TUTORIAL" width="362"> <web_browser border_visible="false" diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml deleted file mode 100644 index 7493a9a90d..0000000000 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<multi_floater - can_resize="true" - follows="left|bottom" - height="422" - layout="topleft" - min_height="130" - min_width="350" - name="im_floater" - save_rect="true" - title="Instant Message" - width="419"> - <multi_floater.string - name="only_user_message"> - You are the only user in this session. - </multi_floater.string> - <multi_floater.string - name="offline_message"> - [FIRST] [LAST] is offline. - </multi_floater.string> - <multi_floater.string - name="invite_message"> - Click the [BUTTON NAME] button to accept/connect to this voice chat. - </multi_floater.string> - <multi_floater.string - name="muted_message"> - You have muted this resident. Sending a message will automatically unmute them. - </multi_floater.string> - <multi_floater.string - name="generic_request_error"> - Error making request, please try again later. - </multi_floater.string> - <multi_floater.string - name="insufficient_perms_error"> - You do not have sufficient permissions. - </multi_floater.string> - <multi_floater.string - name="session_does_not_exist_error"> - The session no longer exists - </multi_floater.string> - <multi_floater.string - name="no_ability_error"> - You do not have that ability. - </multi_floater.string> - <multi_floater.string - name="not_a_mod_error"> - You are not a session moderator. - </multi_floater.string> - <multi_floater.string - name="muted_error"> - A group moderator disabled your text chat. - </multi_floater.string> - <multi_floater.string - name="add_session_event"> - Unable to add users to chat session with [RECIPIENT]. - </multi_floater.string> - <multi_floater.string - name="message_session_event"> - Unable to send your message to the chat session with [RECIPIENT]. - </multi_floater.string> - <multi_floater.string - name="removed_from_group"> - You have been removed from the group. - </multi_floater.string> - <multi_floater.string - name="close_on_no_ability"> - You no longer have the ability to be in the chat session. - </multi_floater.string> - <tab_container - follows="left|top|right|bottom" - height="406" - layout="topleft" - left="1" - name="Preview Tabs" - tab_position="bottom" - top="16" - width="417" /> -</multi_floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml new file mode 100644 index 0000000000..e123de46c2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<multi_floater + can_close="false" + can_minimize="true" + can_resize="true" + height="390" + layout="topleft" + name="floater_im_box" + help_topic="floater_im_box" + save_rect="true" + save_visibility="true" + single_instance="true" + title="CONVERSATIONS" + width="396"> + <tab_container + follows="left|right|top|bottom" + height="390" + layout="topleft" + left="1" + name="im_box_tab_container" + tab_position="bottom" + tab_width="64" + tab_max_width = "134" + tab_height="16" + use_custom_icon_ctrl="true" + tab_icon_ctrl_pad="2" + halign="left" + use_ellipses="true" + top="0" + width="394"> + <first_tab + tab_bottom_image_flash="Toolbar_Left_Flash"/> + <middle_tab + tab_bottom_image_flash="Toolbar_Middle_Flash"/> + <last_tab + tab_bottom_image_flash="Toolbar_Right_Flash"/> + </tab_container> + <icon + color="DefaultShadowLight" + enabled="false" + follows="left|right|bottom" + height="17" + image_name="tabarea.tga" + layout="bottomleft" + left="1" + name="im_box_tab_container_icon" + bottom="10" + width="394" /> +</multi_floater> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml new file mode 100644 index 0000000000..a371e98322 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + background_visible="true" + default_tab_group="1" + follows="all" + height="350" + layout="topleft" + left="0" + name="panel_im" + top="0" + can_dock="false" + can_minimize="true" + can_close="true" + visible="false" + width="394" + can_resize="true" + min_width="250" + min_height="190"> + <layout_stack + animate="false" + default_tab_group="2" + follows="all" + height="320" + width="394" + layout="topleft" + orientation="horizontal" + name="im_panels" + tab_group="1" + top="20" + left="0"> + <layout_panel + name="im_control_panel_holder" + min_width="115" + width="150" + height="320" + auto_resize="false" + user_resize="false"> + <panel + name="panel_im_control_panel" + layout="topleft" + height="320" + width="150" + follows="all"/> + </layout_panel> + <layout_panel + default_tab_group="3" + left="0" + tab_group="2" + top="0" + height="200" + width="254" + user_resize="true"> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Open_Off" + layout="topleft" + width="25" + name="slide_left_btn" /> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Close_Off" + width="25" + name="slide_right_btn" /> + <chat_history + font="SansSerifSmall" + follows="left|right|top|bottom" + height="150" + name="chat_history" + parse_highlights="true" + parse_urls="true" + left="1" + width="249"> + </chat_history> + <line_editor + bottom="0" + follows="left|right|bottom" + font="SansSerifSmall" + height="20" + label="To" + layout="bottomleft" + name="chat_editor" + tab_group="3" + width="249"> + </line_editor> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 907376b1e9..86232de1a4 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="440" layout="topleft" name="Image Preview" + help_topic="image_preview" width="300"> <text type="string" @@ -45,9 +47,11 @@ <text type="string" length="1" - bottom_delta="20" + bottom_delta="30" follows="top|left" - height="15" + height="25" + width="105" + word_wrap="true" layout="topleft" name="preview_label"> Preview image as: @@ -60,31 +64,53 @@ name="clothing_type_combo" top_delta="3" width="160"> - <combo_box.item - label="Image" /> - <combo_box.item - label="Hair" /> - <combo_box.item - label="Female Head" /> - <combo_box.item - label="Female Upper Body" /> - <combo_box.item - label="Female Lower Body" /> - <combo_box.item - label="Male Head" /> - <combo_box.item - label="Male Upper Body" /> - <combo_box.item - label="Male Lower Body" /> - <combo_box.item - label="Skirt" /> - <combo_box.item - label="Sculpted Prim" /> + <item + label="Image" + value="Image" + name="Image" /> + <item + label="Hair" + value="Hair" + name="Hair" /> + <item + label="Female Head" + value="Female Head" + name="FemaleHead" /> + <item + label="Female Upper Body" + value="Female Upper Body" + name="FemaleUpperBody" /> + <item + label="Female Lower Body" + value="Female Lower Body" + name="FemaleLowerBody" /> + <item + label="Male Head" + value="Male Head" + name="MaleHead" /> + <item + label="Male Upper Body" + value="Male Upper Body" + name="MaleUpperBody" /> + <item + label="Male Lower Body" + value="Male Lower Body" + name="MaleLowerBody" /> + <item + label="Skirt" + value="Skirt" + name="Skirt" /> + <item + label="Sculpted Prim" + value="Sculpted Prim" + name="SculptedPrim" /> </combo_box> <text type="string" length="1" - bottom="190" + bottom="225" + height="45" + word_wrap="true" follows="top|left" layout="topleft" left="10" @@ -102,7 +128,7 @@ Try saving image as 24 bit Targa (.tga). layout="topleft" left_delta="2" name="lossless_check" - top_pad="197" + top_pad="162" width="280" /> <button follows="bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index 5c4649276a..24fff6d4ae 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -1,13 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_close="false" can_minimize="false" can_tear_off="false" - height="200" + height="125" layout="topleft" name="incoming call" - title="Unknown Person is calling" - width="240"> + help_topic="incoming_call" + title="UNKNOWN PERSON IS CALLING" + width="410"> + <floater.string + name="lifetime"> + 5 + </floater.string> + <floater.string + name="localchat"> + Nearby Voice Chat + </floater.string> + <floater.string + name="anonymous"> + anonymous + </floater.string> <floater.string name="VoiceInviteP2P"> is calling. @@ -16,6 +30,18 @@ name="VoiceInviteAdHoc"> has joined a Voice Chat call with a conference chat. </floater.string> + <floater.string + name="VoiceInviteGroup"> + just joined '[GROUP]' voice channel. + </floater.string> + <floater.string + name="VoiceInviteQuestionGroup"> + Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'? + </floater.string> + <floater.string + name="VoiceInviteQuestionDefault"> + Do you want to leave [CURRENT_CHAT] and join this voice chat? + </floater.string> <avatar_icon enabled="false" follows="left|top" @@ -25,19 +51,37 @@ left_delta="19" top="35" width="36" /> - <text_editor - font="SansSerif" - height="64" - hide_border="true" - hide_scrollbar="true" + <group_icon + enabled="false" + follows="left|top" + height="36" + layout="topleft" + top="35" + width="36" /> + <text + clip_partial="true" + font="SansSerifLarge" + height="37" layout="topleft" left="77" - max_length="2147483647" name="caller name" - read_only="true" - top="21" - width="163" + top="20" + use_ellipses="true" + width="315" word_wrap="true" /> + <text + clip_partial="true" + font="SansSerif" + height="30" + layout="topleft" + left="77" + name="question" + top_pad="5" + use_ellipses="true" + width="315" + word_wrap="true"> + Do you want to leave [CURRENT_CHAT] and join this voice chat? + </text> <button height="24" label="Accept" @@ -52,16 +96,14 @@ label="Reject" label_selected="Reject" layout="topleft" - left_delta="0" name="Reject" - top_pad="12" + left_pad="10" width="100" /> <button height="24" label="Start IM" layout="topleft" - left_delta="0" name="Start IM" - top_pad="12" + left_pad="10" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index ed3b4f00f2..bea35e5fc1 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -1,20 +1,22 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="300" layout="topleft" min_height="300" min_width="400" name="inspect" + help_topic="inspect" save_rect="true" - title="Inspect Objects" + title="INSPECT OBJECTS" width="400"> <floater.string name="timeStamp"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </floater.string> <scroll_list - bottom="270" + bottom="268" column_padding="0" draw_heading="true" follows="top|right|left|bottom" @@ -25,40 +27,48 @@ tool_tip="Select an object from this list to highlight it in-world" top="20"> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Object Name" name="object_name" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Owner Name" name="owner_name" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Creator Name" name="creator_name" /> <scroll_list.columns label="Creation Date" name="creation_date" width="150" /> + <scroll_list.commit_callback + function="Inspect.SelectObject" /> </scroll_list> <button follows="left|bottom" - height="20" + height="23" label="See Owner Profile..." layout="topleft" - left_delta="0" + left_delta="-1" name="button owner" tool_tip="See profile of the highlighted object's owner" - top_pad="5" - width="150" /> + top_pad="4" + width="150"> + <button.commit_callback + function="Inspect.OwnerProfile" /> + </button> <button follows="left|bottom" - height="20" + height="23" label="See Creator Profile..." layout="topleft" - left_pad="10" + left_pad="5" name="button creator" tool_tip="See profile of the highlighted object's original creator" top_delta="0" - width="150" /> + width="150"> + <button.commit_callback + function="Inspect.CreatorProfile" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index eb05fe1883..ba2e0d3277 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_resize="true" height="563" @@ -7,417 +8,21 @@ min_height="150" min_width="240" name="Inventory" + help_topic="inventory" save_rect="true" save_visibility="true" - title="Inventory" + single_instance="false" + title="MY INVENTORY" width="467"> - <floater.string - name="Title"> - Inventory - </floater.string> - <floater.string - name="Items"> - Items... - </floater.string> - <floater.string - name="Fetched"> - Fetched - </floater.string> - <search_editor - follows="left|top|right" - height="16" - label="Type here to search" - layout="topleft" - left="6" - name="inventory search editor" - top="34" - width="455" /> - <tab_container - follows="left|top|right|bottom" - height="508" - layout="topleft" - left_delta="-4" - name="inventory filter tabs" - tab_position="top" - top_pad="4" - width="463"> - <inventory_panel - follows="left|top|right|bottom" - height="491" - label="All Items" - layout="topleft" - left="1" - name="All Items" - top="16" - width="461" /> - <inventory_panel - follows="left|top|right|bottom" - height="491" - label="Recent Items" - layout="topleft" - left_delta="0" - name="Recent Items" - top_delta="0" - width="461" /> - </tab_container> - <menu_bar - bg_visible="false" - follows="left|top|right" - height="18" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="Inventory Menu" - top_delta="-38" - width="461"> - <menu - height="101" - label="File" - layout="topleft" - left="0" - mouse_opaque="false" - name="File" - tear_off="true" - top="-117" - width="128"> - <menu_item_call - label="Open" - layout="topleft" - name="Open"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="open" /> - </menu_item_call> - <menu - create_jump_keys="true" - label="Upload" - layout="topleft" - name="upload" - tear_off="true"> - <menu_item_call - label="Image (L$[COST])..." - layout="topleft" - name="Upload Image" - shortcut="control|U"> - <menu_item_call.on_click - function="File.UploadImage" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUpload" /> - </menu_item_call> - <menu_item_call - label="Sound (L$[COST])..." - layout="topleft" - name="Upload Sound"> - <menu_item_call.on_click - function="File.UploadSound" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUpload" /> - </menu_item_call> - <menu_item_call - label="Animation (L$[COST])..." - layout="topleft" - name="Upload Animation"> - <menu_item_call.on_click - function="File.UploadAnim" - parameter="" /> - <menu_item_call.on_enable - function="File.EnableUpload" /> - </menu_item_call> - <menu_item_call - label="Bulk (L$[COST] per file)..." - layout="topleft" - name="Bulk Upload"> - <menu_item_call.on_click - function="File.UploadBulk" - parameter="" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="New Window" - layout="topleft" - name="New Window"> - <menu_item_call.on_click - function="Inventory.NewWindow" /> - </menu_item_call> - <menu_item_separator - layout="topleft" - name="separator2" /> - <menu_item_call - label="Show Filters" - layout="topleft" - name="Show Filters"> - <menu_item_call.on_click - function="Inventory.ShowFilters" /> - </menu_item_call> - <menu_item_call - label="Reset Filters" - layout="topleft" - name="Reset Current"> - <menu_item_call.on_click - function="Inventory.ResetFilter" /> - </menu_item_call> - <menu_item_call - label="Close All Folders" - layout="topleft" - name="Close All Folders"> - <menu_item_call.on_click - function="Inventory.CloseAllFolders" /> - </menu_item_call> - <menu_item_separator - layout="topleft" - name="separator3" /> - <menu_item_call - label="Empty Trash" - layout="topleft" - name="Empty Trash"> - <menu_item_call.on_click - function="Inventory.EmptyTrash" /> - </menu_item_call> - <menu_item_call - label="Empty Lost And Found" - layout="topleft" - name="Empty Lost And Found"> - <menu_item_call.on_click - function="Inventory.EmptyLostAndFound" /> - </menu_item_call> - </menu> - <menu - height="121" - label="Create" - layout="topleft" - left="0" - mouse_opaque="false" - name="Create" - tear_off="true" - top="-201" - width="121"> - <menu_item_call - label="New Folder" - layout="topleft" - name="New Folder"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="category" /> - </menu_item_call> - <menu_item_call - label="New Script" - layout="topleft" - name="New Script"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="lsl" /> - </menu_item_call> - <menu_item_call - label="New Note" - layout="topleft" - name="New Note"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="notecard" /> - </menu_item_call> - <menu_item_call - label="New Gesture" - layout="topleft" - name="New Gesture"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="gesture" /> - </menu_item_call> - <menu - height="175" - label="New Clothes" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="New Clothes" - top_pad="514" - width="125"> - <menu_item_call - label="New Shirt" - layout="topleft" - name="New Shirt"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="shirt" /> - </menu_item_call> - <menu_item_call - label="New Pants" - layout="topleft" - name="New Pants"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="pants" /> - </menu_item_call> - <menu_item_call - label="New Shoes" - layout="topleft" - name="New Shoes"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="shoes" /> - </menu_item_call> - <menu_item_call - label="New Socks" - layout="topleft" - name="New Socks"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="socks" /> - </menu_item_call> - <menu_item_call - label="New Jacket" - layout="topleft" - name="New Jacket"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="jacket" /> - </menu_item_call> - <menu_item_call - label="New Skirt" - layout="topleft" - name="New Skirt"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="skirt" /> - </menu_item_call> - <menu_item_call - label="New Gloves" - layout="topleft" - name="New Gloves"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="gloves" /> - </menu_item_call> - <menu_item_call - label="New Undershirt" - layout="topleft" - name="New Undershirt"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="undershirt" /> - </menu_item_call> - <menu_item_call - label="New Underpants" - layout="topleft" - name="New Underpants"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="underpants" /> - </menu_item_call> - <menu_item_call - label="New Alpha" - layout="topleft" - name="New Alpha"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="alpha" /> - </menu_item_call> - <menu_item_call - label="New Tattoo" - layout="topleft" - name="New Tattoo"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="tattoo" /> - </menu_item_call> - </menu> - <menu - height="85" - label="New Body Parts" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="New Body Parts" - top_pad="514" - width="118"> - <menu_item_call - label="New Shape" - layout="topleft" - name="New Shape"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="shape" /> - </menu_item_call> - <menu_item_call - label="New Skin" - layout="topleft" - name="New Skin"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="skin" /> - </menu_item_call> - <menu_item_call - label="New Hair" - layout="topleft" - name="New Hair"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="hair" /> - </menu_item_call> - <menu_item_call - label="New Eyes" - layout="topleft" - name="New Eyes"> - <menu_item_call.on_click - function="Inventory.DoCreate" - parameter="eyes" /> - </menu_item_call> - </menu> - </menu> - <menu - height="49" - label="Sort" - layout="topleft" - left="0" - mouse_opaque="false" - name="Sort" - tear_off="true" - top="-113" - width="118"> - <menu_item_check - control_name="Inventory.SortByName" - label="By Name" - layout="topleft" - name="By Name"> - <menu_item_check.on_click - function="Inventory.SetSortBy" - parameter="name" /> - </menu_item_check> - <menu_item_check - control_name="Inventory.SortByDate" - label="By Date" - layout="topleft" - name="By Date"> - <menu_item_check.on_click - function="Inventory.SetSortBy" - parameter="date" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_check - control_name="Inventory.FoldersAlwaysByName" - label="Folders Always By Name" - layout="topleft" - name="Folders Always By Name"> - <menu_item_check.on_click - function="Inventory.SetSortBy" - parameter="foldersalwaysbyname" /> - </menu_item_check> - <menu_item_check - control_name="Inventory.SystemFoldersToTop" - label="System Folders To Top" - layout="topleft" - name="System Folders To Top"> - <menu_item_check.on_click - function="Inventory.SetSortBy" - parameter="systemfolderstotop" /> - </menu_item_check> - </menu> - </menu_bar> + <panel + bottom="560" + class="panel_main_inventory" + filename="panel_main_inventory.xml" + follows="all" + layout="topleft" + left="0" + label="Inventory Panel" + name="Inventory Panel" + top="15" + width="467" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index 6cb044cda1..366098013b 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" - height="320" + height="340" layout="topleft" name="item properties" + help_topic="item_properties" save_rect="true" - title="Inventory Item Properties" + title="INVENTORY ITEM PROPERTIES" width="350"> <floater.string name="unknown"> @@ -29,14 +31,14 @@ </floater.string> <icon follows="top|right" - height="16" - image_name="icon_lock.tga" + height="18" + image_name="Lock" layout="topleft" - left="294" + left="276" mouse_opaque="true" name="IconLocked" - top="5" - width="16" /> + top="4" + width="18" /> <text type="string" length="1" @@ -104,12 +106,11 @@ left_delta="78" name="LabelCreatorName" top_delta="0" - width="200"> + width="170"> Nicole Linden </text> <button follows="top|right" - font="SansSerifSmall" height="16" label="Profile..." layout="topleft" @@ -138,12 +139,11 @@ left_delta="78" name="LabelOwnerName" top_delta="0" - width="200"> + width="170"> Thrax Linden </text> <button follows="top|right" - font="SansSerifSmall" height="16" label="Profile..." layout="topleft" @@ -185,33 +185,173 @@ name="OwnerLabel" top="125" width="78"> - You can: + You: </text> <check_box height="16" - label="Modify" + label="Edit" layout="topleft" - left_delta="0" + left_pad="5" name="CheckOwnerModify" - top_pad="4" + top_delta="0" width="78" /> <check_box height="16" label="Copy" layout="topleft" - left_delta="78" + left_delta="0" name="CheckOwnerCopy" - top_delta="0" + top_pad="5" width="88" /> <check_box height="16" - label="Resell/Give away" + label="Resell" layout="topleft" - left_delta="88" + left_delta="0" name="CheckOwnerTransfer" + top_pad="5" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="AnyoneLabel" + top_pad="5" + width="78"> + Anyone: + </text> + <check_box + height="16" + label="Copy" + layout="topleft" + left_pad="5" + name="CheckEveryoneCopy" + top_delta="0" + width="130" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="5" + width="78"> + Group: + </text> + <check_box + height="16" + label="Share" + layout="topleft" + left_pad="5" + name="CheckShareWithGroup" + top_delta="5" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="25" + layout="topleft" + left="10" + name="NextOwnerLabel" + top_pad="5" + width="78" + word_wrap="true"> + Next owner: + </text> + <check_box + height="16" + label="Edit" + layout="topleft" + left_pad="5" + name="CheckNextOwnerModify" top_delta="0" + width="78" /> + <check_box + height="16" + label="Copy" + layout="topleft" + left_delta="0" + name="CheckNextOwnerCopy" + top_pad="5" + width="88" /> + <check_box + height="16" + label="Resell" + layout="topleft" + left_delta="0" + name="CheckNextOwnerTransfer" + top_pad="5" width="106" /> + <check_box + height="16" + label="For Sale" + layout="topleft" + left="10" + name="CheckPurchase" + top_pad="5" + width="78" /> + <combo_box + height="19" + left_pad="5" + layout="topleft" + follows="left|top" + name="combobox sale copy" + width="110"> + <combo_box.item + label="Copy" + name="Copy" + value="Copy" /> + <combo_box.item + label="Original" + name="Original" + value="Original" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price:" + label_width="100" + left="10" + width="192" + min_val="1" + height="19" + max_val="999999999" + top_pad="5"/> <text + type="string" + length="1" + height="15" + follows="left|top" + layout="topleft" + left_delta="82" + name="CurrencySymbol" + top_delta="1" + width="18"> + L$ + </text> + + <!--line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="16" + layout="topleft" + left_pad="5" + max_length="25" + name="EditPrice" + top_delta="0" + width="242" /--> + + <!--text type="string" length="1" follows="left|top" @@ -270,60 +410,8 @@ top_delta="0" width="90"> N: - </text> - <check_box - height="16" - label="Share with group" - layout="topleft" - left="10" - name="CheckShareWithGroup" - top="171" - width="106" /> - <check_box - height="16" - label="Allow anyone to copy" - layout="topleft" - left_delta="0" - name="CheckEveryoneCopy" - top_pad="16" - width="130" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="NextOwnerLabel" - top_pad="16" - width="88"> - Next owner can: - </text> - <check_box - height="16" - label="Modify" - layout="topleft" - left_delta="0" - name="CheckNextOwnerModify" - top_pad="4" - width="78" /> - <check_box - height="16" - label="Copy" - layout="topleft" - left_delta="78" - name="CheckNextOwnerCopy" - top_delta="0" - width="88" /> - <check_box - height="16" - label="Resell/Give away" - layout="topleft" - left_delta="88" - name="CheckNextOwnerTransfer" - top_delta="0" - width="106" /> - <text + </text--> + <!--text type="string" length="1" follows="left|top" @@ -331,19 +419,13 @@ layout="topleft" left="10" name="SaleLabel" - top="265" + top_pad="5" width="330"> Mark Item: - </text> - <check_box - height="16" - label="For Sale" - layout="topleft" - left_delta="0" - name="CheckPurchase" - top_pad="4" - width="78" /> - <radio_group + </text--> + + + <!--radio_group draw_border="false" follows="left|top|right" height="16" @@ -368,28 +450,19 @@ name="radio2" top_delta="0" width="70" /> - </radio_group> - <text + </radio_group--> + + <!--text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="42" + left="10" name="TextPrice" - top="299" - width="56"> - Price: L$ - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="16" - layout="topleft" - left_delta="56" - max_length="25" - name="EditPrice" - top_delta="0" - width="242" /> + top_pad="5" + width="78"> + Price: L$ + </text--> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 8bff916f9d..90fee857fb 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="408" layout="topleft" name="Inventory Finder" - title="inventory_recent_items" - width="160"> + help_topic="inventory_finder" + title="INVENTORY_RECENT_ITEMS" + width="280"> <icon height="16" - image_name="inv_item_animation.tga" + image_name="Inv_Animation" layout="topleft" left="8" mouse_opaque="true" @@ -25,7 +27,7 @@ width="126" /> <icon height="16" - image_name="inv_item_callingcard_online.tga" + image_name="Inv_CallingCard" layout="topleft" left="8" mouse_opaque="true" @@ -42,7 +44,7 @@ width="126" /> <icon height="16" - image_name="inv_item_shirt.tga" + image_name="Inv_Shirt" layout="topleft" left="8" mouse_opaque="true" @@ -59,7 +61,7 @@ width="126" /> <icon height="16" - image_name="inv_item_gesture.tga" + image_name="Inv_Gesture" layout="topleft" left="8" mouse_opaque="true" @@ -76,7 +78,7 @@ width="126" /> <icon height="16" - image_name="inv_item_landmark_visited.tga" + image_name="Inv_Landmark" layout="topleft" left="8" mouse_opaque="true" @@ -93,7 +95,7 @@ width="126" /> <icon height="16" - image_name="inv_item_notecard.tga" + image_name="Inv_Notecard" layout="topleft" left="8" mouse_opaque="true" @@ -110,7 +112,7 @@ width="126" /> <icon height="16" - image_name="inv_item_object.tga" + image_name="Inv_Object" layout="topleft" left="8" mouse_opaque="true" @@ -127,7 +129,7 @@ width="126" /> <icon height="16" - image_name="inv_item_script.tga" + image_name="Inv_Script" layout="topleft" left="8" mouse_opaque="true" @@ -144,7 +146,7 @@ width="126" /> <icon height="16" - image_name="inv_item_sound.tga" + image_name="Inv_Sound" layout="topleft" left="8" mouse_opaque="true" @@ -161,7 +163,7 @@ width="126" /> <icon height="16" - image_name="inv_item_texture.tga" + image_name="Inv_Texture" layout="topleft" left="8" mouse_opaque="true" @@ -178,7 +180,7 @@ width="126" /> <icon height="16" - image_name="inv_item_snapshot.tga" + image_name="Inv_Snapshot" layout="topleft" left="8" mouse_opaque="true" diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index 032ff21b58..6e1bb8fcd0 100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="500" layout="topleft" name="Joystick" - title="Joystick Configuration" - width="550"> + help_topic="joystick" + title="JOYSTICK CONFIGURATION" + width="569"> <floater.string name="NoDevice"> no device detected @@ -121,21 +123,24 @@ label="Direct Zoom" layout="topleft" left="185" - name="ZoomDirect" /> + name="ZoomDirect" + width="60" /> <check_box bottom_delta="0" control_name="Cursor3D" label="3D Cursor" layout="topleft" left="310" - name="Cursor3D" /> + name="Cursor3D" + width="60" /> <check_box bottom_delta="0" control_name="AutoLeveling" label="Auto Level" layout="topleft" left="420" - name="AutoLeveling" /> + name="AutoLeveling" + width="60" /> <text type="string" length="1" @@ -143,7 +148,7 @@ halign="right" height="10" layout="topleft" - left="12" + left="37" mouse_opaque="false" name="Control Modes:" top="110" @@ -156,7 +161,7 @@ halign="center" label="Avatar" layout="topleft" - left="125" + left="150" name="JoystickAvatarEnabled" width="60" /> <check_box @@ -165,7 +170,7 @@ halign="center" label="Build" layout="topleft" - left="194" + left="219" name="JoystickBuildEnabled" width="60" /> <check_box @@ -174,14 +179,14 @@ halign="center" label="Flycam" layout="topleft" - left="262" + left="289" name="JoystickFlycamEnabled" width="60" /> <stat_view height="250" label="Joystick Monitor" layout="topleft" - left="340" + left="359" name="axis_view" show_label="true" top="142" @@ -245,9 +250,9 @@ bottom="144" halign="right" layout="topleft" - left="20" + left="3" name="XScale" - width="94"> + width="140"> X Scale </text> <spinner @@ -256,7 +261,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="125" + left="150" max_val="50" min_val="-50" name="AvatarAxisScale1" @@ -267,7 +272,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale1" @@ -278,7 +283,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale1" @@ -289,9 +294,9 @@ bottom="164" halign="right" layout="topleft" - left="20" + left="3" name="YScale" - width="94"> + width="140"> Y Scale </text> <spinner @@ -300,7 +305,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="125" + left="150" max_val="50" min_val="-50" name="AvatarAxisScale2" @@ -311,7 +316,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale2" @@ -322,7 +327,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale2" @@ -333,9 +338,9 @@ bottom="184" halign="right" layout="topleft" - left="20" + left="3" name="ZScale" - width="94"> + width="140"> Z Scale </text> <spinner @@ -344,7 +349,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="125" + left="150" max_val="50" min_val="-50" name="AvatarAxisScale0" @@ -355,7 +360,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale0" @@ -366,7 +371,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale0" @@ -377,9 +382,9 @@ bottom="204" halign="right" layout="topleft" - left="20" + left="3" name="PitchScale" - width="94"> + width="140"> Pitch Scale </text> <spinner @@ -388,7 +393,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="125" + left="150" max_val="1024" min_val="-1024" name="AvatarAxisScale4" @@ -399,7 +404,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale4" @@ -410,7 +415,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale4" @@ -421,9 +426,9 @@ bottom="224" halign="right" layout="topleft" - left="20" + left="3" name="YawScale" - width="94"> + width="140"> Yaw Scale </text> <spinner @@ -432,7 +437,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="125" + left="150" max_val="1024" min_val="-1024" name="AvatarAxisScale5" @@ -443,7 +448,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale5" @@ -454,7 +459,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale5" @@ -465,9 +470,9 @@ bottom="244" halign="right" layout="topleft" - left="20" + left="3" name="RollScale" - width="94"> + width="140"> Roll Scale </text> <spinner @@ -476,7 +481,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="195" + left="220" max_val="1024" min_val="-1024" name="BuildAxisScale3" @@ -487,7 +492,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale3" @@ -498,9 +503,9 @@ bottom="274" halign="right" layout="topleft" - left="20" + left="3" name="XDeadZone" - width="94"> + width="140"> X Dead Zone </text> <spinner @@ -510,7 +515,7 @@ increment="0.01" label_width="0" layout="topleft" - left="125" + left="150" name="AvatarAxisDeadZone1" width="56" /> <spinner @@ -520,7 +525,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone1" width="56" /> <spinner @@ -530,7 +535,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone1" width="56" /> <text @@ -539,9 +544,9 @@ bottom="294" halign="right" layout="topleft" - left="20" + left="3" name="YDeadZone" - width="94"> + width="140"> Y Dead Zone </text> <spinner @@ -551,7 +556,7 @@ increment="0.01" label_width="0" layout="topleft" - left="125" + left="150" name="AvatarAxisDeadZone2" width="56" /> <spinner @@ -561,7 +566,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone2" width="56" /> <spinner @@ -571,7 +576,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone2" width="56" /> <text @@ -580,9 +585,9 @@ bottom="314" halign="right" layout="topleft" - left="20" + left="3" name="ZDeadZone" - width="94"> + width="140"> Z Dead Zone </text> <spinner @@ -592,7 +597,7 @@ increment="0.01" label_width="0" layout="topleft" - left="125" + left="150" name="AvatarAxisDeadZone0" width="56" /> <spinner @@ -602,7 +607,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone0" width="56" /> <spinner @@ -612,7 +617,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone0" width="56" /> <text @@ -621,9 +626,9 @@ bottom="334" halign="right" layout="topleft" - left="20" + left="2" name="PitchDeadZone" - width="94"> + width="140"> Pitch Dead Zone </text> <spinner @@ -633,7 +638,7 @@ increment="0.01" label_width="0" layout="topleft" - left="125" + left="150" name="AvatarAxisDeadZone4" width="56" /> <spinner @@ -643,7 +648,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone4" width="56" /> <spinner @@ -653,7 +658,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone4" width="56" /> <text @@ -662,9 +667,9 @@ bottom="354" halign="right" layout="topleft" - left="20" + left="3" name="YawDeadZone" - width="94"> + width="140"> Yaw Dead Zone </text> <spinner @@ -674,7 +679,7 @@ increment="0.01" label_width="0" layout="topleft" - left="125" + left="150" name="AvatarAxisDeadZone5" width="56" /> <spinner @@ -684,7 +689,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone5" width="56" /> <spinner @@ -694,7 +699,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone5" width="56" /> <text @@ -703,9 +708,9 @@ bottom="374" halign="right" layout="topleft" - left="20" + left="3" name="RollDeadZone" - width="94"> + width="140"> Roll Dead Zone </text> <spinner @@ -715,7 +720,7 @@ increment="0.01" label_width="0" layout="topleft" - left="195" + left="220" name="BuildAxisDeadZone3" width="56" /> <spinner @@ -725,7 +730,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone3" width="56" /> <text @@ -734,9 +739,9 @@ bottom="402" halign="right" layout="topleft" - left="20" + left="3" name="Feathering" - width="94"> + width="140"> Feathering </text> <slider @@ -747,7 +752,7 @@ increment="1" initial_value="0.7" layout="topleft" - left="116" + left="141" max_val="32" min_val="1" name="AvatarFeathering" @@ -790,9 +795,9 @@ bottom="430" halign="right" layout="topleft" - left="20" + left="3" name="ZoomScale2" - width="94"> + width="140"> Zoom Scale </text> <spinner @@ -801,7 +806,7 @@ decimal_digits="2" label_width="0" layout="topleft" - left="265" + left="290" max_val="1024" min_val="-1024" name="FlycamAxisScale6" @@ -812,9 +817,9 @@ bottom="450" halign="right" layout="topleft" - left="20" + left="3" name="ZoomDeadZone" - width="94"> + width="140"> Zoom Dead Zone </text> <spinner @@ -824,7 +829,7 @@ increment="0.01" label_width="0" layout="topleft" - left="265" + left="290" name="FlycamAxisDeadZone6" width="56" /> <button @@ -832,10 +837,10 @@ height="22" label="SpaceNavigator Defaults" layout="topleft" - left="340" + left="359" name="SpaceNavigatorDefaults" top="429" - width="184" /> + width="200" /> <button follows="right|bottom" height="20" @@ -845,7 +850,7 @@ left_delta="0" name="ok_btn" top_pad="9" - width="90" /> + width="98" /> <button follows="right|bottom" height="20" @@ -855,5 +860,5 @@ left_pad="4" name="cancel_btn" top_delta="0" - width="90" /> + width="98" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index ebe8df9f5e..b24c745bdd 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="150" + legacy_header_height="18" + height="170" layout="topleft" name="floater_lagmeter" + help_topic="floater_lagmeter" save_rect="true" - title="Lag Meter" + title="LAG METER" width="350"> <floater.string name="max_title_msg"> @@ -182,7 +184,6 @@ layout="topleft" left="8" name="client_lagmeter" - picture_style="true" tab_stop="false" tool_tip="Client lag status" top="24" @@ -198,9 +199,10 @@ name="client" top_delta="0" width="128"> - Client: + Client </text> <text + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="40" @@ -214,6 +216,7 @@ Normal </text> <text + invisiblity_control="LagMeterShrunk" bottom="56" follows="left|top" height="16" @@ -229,7 +232,6 @@ layout="topleft" left="8" name="network_lagmeter" - picture_style="true" tab_stop="false" tool_tip="Network lag status" top="64" @@ -245,9 +247,10 @@ name="network" top_delta="0" width="128"> - Network: + Network </text> <text + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="80" @@ -261,6 +264,7 @@ Normal </text> <text + invisiblity_control="LagMeterShrunk" bottom="96" follows="left|top" height="16" @@ -276,7 +280,6 @@ layout="topleft" left="8" name="server_lagmeter" - picture_style="true" tab_stop="false" tool_tip="Server lag status" top="104" @@ -292,9 +295,10 @@ name="server" top_delta="0" width="60"> - Server: + Server </text> <text + invisiblity_control="LagMeterShrunk" type="string" length="1" bottom="120" @@ -302,12 +306,13 @@ font="SansSerif" height="16" layout="topleft" - left="85" + left="110" name="server_text" right="-10"> Normal </text> <text + invisiblity_control="LagMeterShrunk" bottom="136" follows="left|top" height="16" @@ -316,22 +321,16 @@ name="server_lag_cause" right="-32" /> <button - bottom="145" - follows="left|top" - height="18" - help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4851" - label="?" - layout="topleft" - name="server_help" - right="-10" - width="18" /> - <button follows="left|top" height="20" label=">>" layout="topleft" - left_delta="-317" + left="10" name="minimize" - top_delta="-2" - width="25" /> + tool_tip="Toggle floater size" + top_delta="24" + width="40"> + <button.commit_callback + function="LagMeter.ClickShrink" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 0ed4bb4e07..0b9ae3c9f3 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -1,91 +1,94 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="383" + legacy_header_height="18" + height="430" layout="topleft" name="land holdings floater" - title="My Land" + help_topic="land_holdings_floater" + title="MY LAND" width="600"> <floater.string name="area_string"> - [AREA] sq. meters + [AREA] m² </floater.string> <scroll_list draw_heading="true" height="170" layout="topleft" - left="8" + left="10" name="parcel list" - top="24" - width="584"> + top="28" + width="580"> <scroll_list.columns - label="Parcel Name" + label="Parcel" name="name" - width="163" /> + width="167" /> <scroll_list.columns label="Region" name="location" - width="175" /> + width="180" /> <scroll_list.columns label="Type" name="type" - width="140" /> + width="145" /> <scroll_list.columns label="Area" name="area" - width="87" /> + width="88" /> <scroll_list.columns label="" name="hidden" width="-1" /> </scroll_list> <button - height="20" + height="23" label="Teleport" label_selected="Teleport" layout="topleft" - left_delta="4" + top="208" + left="10" name="Teleport" tool_tip="Teleport to the center of this land." - top_pad="4" - width="100" /> + width="80" /> <button - height="20" - label="Show on Map" - label_selected="Show on Map" + height="23" + label="Map" + label_selected="Map" layout="topleft" - left_pad="4" + top="208" + left="95" name="Show on Map" - tool_tip="Show this land on the world map." - top_delta="0" - width="100" /> + tool_tip="Show this land on the world map" + width="80" /> <text type="string" length="1" follows="left|top" - height="16" layout="topleft" - left="12" + top="251" + left="10" name="contrib_label" - top="222" - width="480"> + height="16" + width="580"> Contributions to your groups: </text> <scroll_list draw_heading="true" height="75" layout="topleft" - left_delta="-4" name="grant list" - top_pad="4" - width="584"> + top="271" + left="10" + width="580"> <scroll_list.columns label="Group" name="group" - width="330" /> + width="290" + left_pad="10" /> <scroll_list.columns label="Area" name="area" - width="220" /> + width="290" /> </scroll_list> <text type="string" @@ -93,10 +96,10 @@ follows="left|top" height="16" layout="topleft" - left_delta="4" name="allowed_label" - top_pad="4" - width="348"> + top="366" + left="10" + width="365"> Allowed land holdings at current payment plan: </text> <text @@ -105,11 +108,11 @@ follows="left|top" height="16" layout="topleft" - left_delta="340" name="allowed_text" - top_delta="0" - width="132"> - [AREA] sq. meters + top="366" + left="380" + width="290"> + [AREA] m² </text> <text type="string" @@ -117,10 +120,10 @@ follows="left|top" height="16" layout="topleft" - left="12" + top="386" + left="10" name="current_label" - top="341" - width="348"> + width="365"> Current land holdings: </text> <text @@ -129,11 +132,11 @@ follows="left|top" height="16" layout="topleft" - left_delta="340" + top="386" + left="380" name="current_text" - top_delta="0" - width="132"> - [AREA] sq. meters + width="290"> + [AREA] m² </text> <text type="string" @@ -142,10 +145,10 @@ font="SansSerifBold" height="16" layout="topleft" - left="12" + top="406" + left="10" name="available_label" - top="361" - width="348"> + width="365"> Available for land purchases: </text> <text @@ -155,10 +158,10 @@ font="SansSerifBold" height="16" layout="topleft" - left_delta="340" name="available_text" - top_delta="0" - width="140"> - [AREA] sq. meters + top="406" + left="380" + width="290"> + [AREA] m² </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 0735ac160a..1f192f9b28 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -1,20 +1,22 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" bevel_style="none" border_style="line" can_resize="true" follows="left|top" - height="550" + height="580" layout="topleft" min_height="271" min_width="290" name="script ed float" + help_topic="script_ed_float" save_rect="true" - title="Script: New Script" - width="500"> + title="SCRIPT: NEW SCRIPT" + width="508"> <floater.string name="not_allowed"> - You are not allowed to view this script. + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. </floater.string> <floater.string name="script_running"> @@ -22,19 +24,31 @@ </floater.string> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> + <panel + bevel_style="none" + + border_style="line" + follows="left|top|right|bottom" + height="522" + layout="topleft" + left="10" + name="script ed panel" + top="20" + width="497" /> <button - follows="right|bottom" - height="20" + follows="left|bottom" + height="23" label="Reset" label_selected="Reset" layout="topleft" - left="362" name="Reset" - top="525" - width="128" /> + left="10" + width="85" /> <check_box + left_delta="90" + top_delta="3" enabled="false" follows="left|bottom" font="SansSerif" @@ -42,30 +56,17 @@ initial_value="true" label="Running" layout="topleft" - left_delta="-350" name="running" - top_delta="2" - width="100" /> + width="205" /> <check_box - enabled="false" + left_delta="140" + enabled="true" follows="left|bottom" font="SansSerif" height="18" initial_value="true" label="Mono" layout="topleft" - left_delta="70" name="mono" - top_delta="0" width="100" /> - <panel - bevel_style="none" - border_style="line" - follows="left|top|right|bottom" - height="506" - layout="topleft" - left="1" - name="script ed panel" - top="18" - width="497" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml index ce6b0efd03..c9d87f158f 100644 --- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" follows="left|top" height="400" @@ -7,8 +8,9 @@ min_height="271" min_width="350" name="script ed float" + help_topic="lsl_reference" save_rect="true" - title="LSL Wiki" + title="LSL REFERENCE" width="370"> <check_box follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index ed3b00250b..6370ff9243 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,172 +1,142 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + bg_alpha_image_overlay="DkGray_66" + legacy_header_height="0" + can_minimize="true" can_resize="true" follows="top|right" - height="225" + height="174" layout="topleft" - min_height="60" - min_width="174" + min_height="128" + min_width="128" name="Map" + title="" + help_topic="map" save_rect="true" save_visibility="true" single_instance="true" + left="0" + top="0" width="200"> <floater.string - name="mini_map_north"> - N - </floater.string> - <floater.string - name="mini_map_east"> - E - </floater.string> - <floater.string - name="mini_map_west"> - W - </floater.string> - <floater.string - name="mini_map_south"> - S - </floater.string> - <floater.string - name="mini_map_southeast"> - SE - </floater.string> - <floater.string - name="mini_map_northeast"> - NE - </floater.string> - <floater.string - name="mini_map_southwest"> - SW - </floater.string> - <floater.string - name="mini_map_northwest"> - NW - </floater.string> - <floater.string name="ToolTipMsg"> - [AGENT][REGION](Double-click to open Map) + [REGION](Double-click to open Map, shift-drag to pan) + </floater.string> + <floater.string name="mini_map_caption"> + MINIMAP </floater.string> <net_map bg_color="NetMapBackgroundColor" - bottom="225" follows="top|left|bottom|right" layout="topleft" left="0" mouse_opaque="false" name="Net Map" - right="198" - top="2" /> + width="200" + height="218" + top="0"/> <text type="string" length="1" - bottom="225" + bottom="218" label="N" layout="topleft" left="0" name="floater_map_north" right="10" - text="N" text_color="1 1 1 0.7" - top="215"> + top="209"> N </text> <text type="string" length="1" - bottom="225" + bottom="218" label="E" layout="topleft" left="0" name="floater_map_east" right="10" - text="E" text_color="1 1 1 0.7" - top="215"> + top="209"> E </text> <text type="string" length="1" - bottom="225" + bottom="205" label="W" layout="topleft" left="0" name="floater_map_west" right="11" - text="W" text_color="1 1 1 0.7" - top="215"> + top="195"> W </text> <text type="string" length="1" - bottom="225" + bottom="218" label="S" layout="topleft" left="0" name="floater_map_south" right="10" - text="S" text_color="1 1 1 0.7" - top="215"> + top="209"> S </text> <text type="string" length="1" - bottom="225" + bottom="218" label="SE" layout="topleft" left="0" name="floater_map_southeast" right="20" - text="SE" text_color="1 1 1 0.7" - top="215"> + top="209"> SE </text> <text type="string" length="1" - bottom="225" + bottom="218" label="NE" layout="topleft" left="0" name="floater_map_northeast" right="20" - text="NE" text_color="1 1 1 0.7" - top="215"> + top="209"> NE </text> <text type="string" length="1" - bottom="225" + bottom="218" label="SW" layout="topleft" left="0" name="floater_map_southwest" right="20" - text="SW" text_color="1 1 1 0.7" - top="215"> + top="209"> SW </text> <text type="string" length="1" - bottom="225" + bottom="218" label="NW" layout="topleft" left="0" name="floater_map_northwest" right="20" - text="NW" text_color="1 1 1 0.7" - top="215"> + top="209"> NW </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index a073c3443a..49e835cce4 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -1,27 +1,41 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="440" layout="topleft" min_height="140" min_width="467" name="floater_about" + help_topic="floater_about" save_rect="true" - title="Media Browser" + auto_tile="true" + title="MEDIA BROWSER" width="820"> + <floater.string + name="home_page_url"> + http://www.secondlife.com + </floater.string> + <floater.string + name="support_page_url"> + http://support.secondlife.com + </floater.string> <layout_stack bottom="440" follows="left|right|top|bottom" layout="topleft" left="10" name="stack1" + orientation="vertical" top="20" width="800"> <layout_panel auto_resize="false" + default_tab_group="1" height="20" layout="topleft" left="0" + min_height="20" name="nav_controls" top="400" user_resize="false" @@ -34,7 +48,10 @@ left="0" name="back" top="0" - width="55" /> + width="55"> + <button.commit_callback + function="MediaBrowser.Back" /> + </button> <button follows="left|top" height="20" @@ -43,7 +60,10 @@ left_pad="3" name="forward" top_delta="0" - width="68" /> + width="68"> + <button.commit_callback + function="MediaBrowser.Forward" /> + </button> <button enabled="false" follows="left|top" @@ -53,17 +73,25 @@ left_pad="2" name="reload" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MediaBrowser.Refresh" /> + </button> <combo_box allow_text_entry="true" follows="left|top|right" + tab_group="1" height="20" layout="topleft" left_pad="5" - max_chars="255" + max_chars="1024" name="address" + combo_editor.select_on_focus="true" top_delta="0" - width="540" /> + width="540"> + <combo_box.commit_callback + function="MediaBrowser.EnterAddress" /> + </combo_box> <button enabled="false" follows="right|top" @@ -73,6 +101,67 @@ left_pad="5" name="go" top_delta="0" + width="55"> + <button.commit_callback + function="MediaBrowser.Go" /> + </button> + </layout_panel> + <layout_panel + auto_resize="false" + height="20" + layout="topleft" + left_delta="0" + min_height="20" + name="time_controls" + top_delta="0" + user_resize="false" + width="800"> + <button + follows="left|top" + height="20" + label="rewind" + layout="topleft" + left="0" + name="rewind" + top="0" + width="55" /> + <button + follows="left|top" + height="20" + image_selected="button_anim_play_selected.tga" + image_unselected="button_anim_play.tga" + layout="topleft" + left_delta="55" + name="play" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + image_selected="button_anim_pause_selected.tga" + image_unselected="button_anim_pause.tga" + layout="topleft" + left_delta="0" + name="pause" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + label="stop" + layout="topleft" + left_pad="10" + name="stop" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + label="forward" + layout="topleft" + left_pad="20" + name="seek" + top_delta="0" width="55" /> </layout_panel> <layout_panel @@ -80,6 +169,7 @@ height="20" layout="topleft" left_delta="0" + min_height="20" name="parcel_owner_controls" top_delta="0" user_resize="false" @@ -88,24 +178,27 @@ enabled="false" follows="left|top" height="20" - label="Send Current URL to Parcel" + label="Send Current Page to Parcel" layout="topleft" left="0" name="assign" top="0" - width="200" /> + width="200"> + <button.commit_callback + function="MediaBrowser.Assign" /> + </button> </layout_panel> <layout_panel - height="20" + height="40" layout="topleft" left_delta="0" name="external_controls" top_delta="0" user_resize="false" width="540"> - <web_browser - bottom="-10" - follows="left|right|top|bottom" + <web_browser + bottom="-30" + follows="all" layout="topleft" left="0" name="browser" @@ -119,7 +212,10 @@ left_delta="0" name="open_browser" top_pad="5" - width="185" /> + width="185"> + <button.commit_callback + function="MediaBrowser.OpenWebBrowser" /> + </button> <check_box control_name="UseExternalBrowser" follows="bottom|left" @@ -138,7 +234,10 @@ left_pad="80" name="close" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MediaBrowser.Close" /> + </button> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml new file mode 100644 index 0000000000..681731b0da --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_close="true" + can_drag_on_left="false" + can_minimize="true" + can_resize="false" + can_tear_off="true" + default_tab_group="1" + enabled="true" + width="365" + height="535" + left="330" + min_height="535" + min_width="365" + mouse_opaque="true" + name="media_settings" + help_topic = "media_settings" + title="MEDIA SETTINGS"> + <button + bottom="525" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="OK" + label_selected="OK" + left="75" + mouse_opaque="true" + name="OK" + scale_image="true" + width="90" /> + <button + bottom_delta="0" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="Cancel" + label_selected="Cancel" + left_delta="93" + mouse_opaque="true" + name="Cancel" + scale_image="true" + width="90" /> + <button + bottom_delta="0" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="Apply" + label_selected="Apply" + left_delta="93" + mouse_opaque="true" + name="Apply" + scale_image="true" + width="90" /> + <tab_container + bottom="500" + enabled="true" + follows="left|top|right|bottom" + height="485" + left="0" + mouse_opaque="false" + name="tab_container" + tab_group="1" + tab_position="top" + tab_width="80" + width="365" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index e2a99e6614..28a29c42aa 100644 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" follows="left|top" height="175" layout="topleft" name="MemLeak" - title="Memory Leaking Simulation" + help_topic="memleak" + title="SIMULATE A MEMORY LEAK" width="350"> <spinner decimal_digits="0" @@ -20,7 +22,10 @@ max_val="4.29497e+009" name="leak_speed" top="30" - width="330" /> + width="330"> + <spinner.commit_callback + function="MemLeak.ChangeLeakingSpeed" /> + </spinner> <spinner decimal_digits="0" follows="left|top" @@ -34,7 +39,10 @@ max_val="4096" name="max_leak" top_pad="5" - width="330" /> + width="330"> + <spinner.commit_callback + function="MemLeak.ChangeMaxMemLeaking" /> + </spinner> <text type="string" length="1" @@ -79,7 +87,10 @@ left_delta="0" name="start_btn" top_delta="20" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Start" /> + </button> <button follows="left|top" height="20" @@ -88,7 +99,10 @@ left_pad="7" name="stop_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Stop" /> + </button> <button follows="left|top" height="20" @@ -97,7 +111,10 @@ left_pad="7" name="release_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Release" /> + </button> <button follows="left|top" height="20" @@ -106,5 +123,8 @@ left_pad="36" name="close_btn" top_delta="0" - width="70" /> + width="70"> + <button.commit_callback + function="MemLeak.Close" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 47342ffc5b..6f29255a6b 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,127 +1,267 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - can_minimize="false" - center_horiz="true" + legacy_header_height="18" + can_dock="true" + can_minimize="true" + can_close="false" follows="bottom" - height="58" + height="110" layout="topleft" name="move_floater" + help_topic="move_floater" save_rect="true" - width="135"> - <button - follows="left|bottom" - height="25" - image_disabled="move_turn_left_out.tga" - image_disabled_selected="move_turn_left_in.tga" - image_selected="move_turn_left_in.tga" - image_unselected="move_turn_left_out.tga" + save_visibility="true" + save_dock_state="true" + width="133"> + <string + name="walk_forward_tooltip"> + Walk Forward (press Up Arrow or W) + </string> + <string + name="walk_back_tooltip"> + Walk Backwards (press Down Arrow or S) + </string> + <string + name="walk_left_tooltip"> + Walk left (press Shift + Left Arrow or A) + </string> + <string + name="walk_right_tooltip"> + Walk right (press Shift + Right Arrow or D) + </string> + <string + name="run_forward_tooltip"> + Run Forward (press Up Arrow or W) + </string> + <string + name="run_back_tooltip"> + Run Backwards (press Down Arrow or S) + </string> + <string + name="run_left_tooltip"> + Run left (press Shift + Left Arrow or A) + </string> + <string + name="run_right_tooltip"> + Run right (press Shift + Right Arrow or D) + </string> + <string + name="fly_forward_tooltip"> + Fly Forward (press Up Arrow or W) + </string> + <string + name="fly_back_tooltip"> + Fly Backwards (press Down Arrow or S) + </string> + <string + name="fly_left_tooltip"> + Fly left (press Shift + Left Arrow or A) + </string> + <string + name="fly_right_tooltip"> + Fly right (press Shift + Right Arrow or D) + </string> + <string + name="fly_up_tooltip"> + Fly up (press E) + </string> + <string + name="fly_down_tooltip"> + Fly down (press C) + </string> + <string + name="jump_tooltip"> + Jump (press E) + </string> + <string + name="crouch_tooltip"> + Crouch (press C) + </string> + <string + name="walk_title"> + Walk + </string> + <string + name="run_title"> + Run + </string> + <string + name="fly_title"> + Fly + </string> + <panel + border="false" + height="83" + follows="left|top" layout="topleft" - left="20" - name="turn left btn" - picture_style="true" - scale_image="false" - tool_tip="Turn Left" - top="29" - width="25" /> - <button - follows="left|bottom" - height="25" - image_disabled="move_turn_right_out.tga" - image_disabled_selected="move_turn_right_in.tga" - image_selected="move_turn_right_in.tga" - image_unselected="move_turn_right_out.tga" + left="0" + mouse_opaque="false" + name="panel_actions" + top="0" + width="133"> + <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad--> + <!-- Left column --> + <button + follows="left|bottom" + height="24" + image_selected="Movement_TurnLeft_On" + image_pressed_selected="Movement_TurnLeft_On" + image_unselected="Movement_TurnLeft_Off" + layout="topleft" + left="30" + name="turn left btn" + scale_image="false" + tool_tip="Turn left (press Left Arrow or A)" + top="34" + width="24" /> + <joystick_slide + follows="left|bottom" + height="10" + image_selected="Movement_Left_On" + image_pressed_selected="Movement_Left_On" + image_unselected="Movement_Left_Off" + layout="topleft" + left_delta="4" + name="move left btn" + quadrant="left" + scale_image="false" + tool_tip="Walk left (press Shift + Left Arrow or A)" + top_pad="10" + width="19" /> + <!-- Right column --> + <button + follows="left|bottom" + height="24" + image_selected="Movement_TurnRight_On" + image_pressed_selected="Movement_TurnRight_On" + image_unselected="Movement_TurnRight_Off" + layout="topleft" + right="-30" + name="turn right btn" + scale_image="false" + tool_tip="Turn right (press Right Arrow or D)" + top="34" + width="24" /> + <joystick_slide + follows="left|bottom" + height="10" + image_selected="Movement_Right_On" + image_pressed_selected="Movement_Right_On" + image_unselected="Movement_Right_Off" + layout="topleft" + name="move right btn" + quadrant="right" + right_delta="4" + scale_image="false" + tool_tip="Walk right (press Shift + Right Arrow or D)" + top_pad="10" + width="19" /> + <!-- Middle column --> + <joystick_turn + follows="left|bottom" + height="24" + image_selected="Movement_Forward_On" + image_pressed_selected="Movement_Forward_On" + image_unselected="Movement_Forward_Off" + layout="topleft" + left="54" + name="forward btn" + quadrant="up" + scale_image="false" + tool_tip="Walk forward (press up arrow or W)" + top="20" + width="24" /> + <joystick_turn + follows="left|bottom" + height="24" + image_selected="Movement_Backward_On" + image_pressed_selected="Movement_Backward_On" + image_unselected="Movement_Backward_Off" + layout="topleft" + left_delta="0" + name="backward btn" + quadrant="down" + scale_image="false" + tool_tip="Walk backward (press down arrow or S)" + top_pad="5" + width="24" /> + <!-- Fly up/down (jump/crouch) buttons --> + <button + follows="left|bottom" + height="19" + image_selected="Movement_Up_On" + image_pressed_selected="Movement_Up_On" + image_unselected="Movement_Up_Off" + layout="topleft" + right="-11" + name="move up btn" + scale_image="false" + tool_tip="Fly up (press E)" + top="22" + width="10" /> + <button + follows="left|bottom" + height="19" + image_selected="Movement_Down_On" + image_pressed_selected="Movement_Down_On" + image_unselected="Movement_Down_Off" + layout="topleft" + right_delta="0" + name="move down btn" + scale_image="false" + tool_tip="Fly down (press C)" + top_pad="10" + width="10" /> + </panel> +<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml --> + <panel + border="false" + height="27" layout="topleft" - left_pad="21" - name="turn right btn" - picture_style="true" - scale_image="false" - tool_tip="Turn Right" - top_delta="0" - width="25" /> - <button - follows="left|bottom" - height="25" - image_disabled="move_up_out.tga" - image_disabled_selected="move_up_in.tga" - image_selected="move_up_in.tga" - image_unselected="move_up_out.tga" - layout="topleft" - left="91" - name="move up btn" - picture_style="true" - scale_image="false" - tool_tip="Jump or Fly Up" - top="4" - width="25" /> - <button - follows="left|bottom" - height="25" - image_disabled="move_down_out.tga" - image_disabled_selected="move_down_in.tga" - image_selected="move_down_in.tga" - image_unselected="move_down_out.tga" - layout="topleft" - left_delta="0" - name="move down btn" - picture_style="true" - scale_image="false" - tool_tip="Crouch or Fly Down" - top_delta="25" - width="25" /> - <joystick_slide - follows="left|bottom" - height="25" - image_selected="move_left_in.tga" - image_unselected="move_left_out.tga" - layout="topleft" - left="20" - name="slide left btn" - picture_style="true" - quadrant="left" - scale_image="false" - tool_tip="Move Left" - top="4" - width="25" /> - <joystick_slide - follows="left|bottom" - height="25" - image_selected="move_right_in.tga" - image_unselected="move_right_out.tga" - layout="topleft" - left_pad="21" - name="slide right btn" - picture_style="true" - quadrant="right" - scale_image="false" - tool_tip="Move Right" - top_delta="0" - width="25" /> - <joystick_turn - follows="left|bottom" - height="25" - image_selected="move_forward_in.tga" - image_unselected="move_forward_out.tga" - layout="topleft" - left_delta="-21" - name="forward btn" - picture_style="true" - quadrant="up" - scale_image="false" - tool_tip="Move Forward" - top_delta="0" - width="21" /> - <joystick_turn - follows="left|bottom" - height="25" - image_selected="move_backward_in.tga" - image_unselected="move_backward_out.tga" - layout="topleft" - left_delta="0" - name="backward btn" - picture_style="true" - quadrant="down" - scale_image="false" - tool_tip="Move Backward" - top_delta="25" - width="21" /> + left="0" + name="panel_modes" + top_pad="0" + width="133"> + <button + follows="left|bottom" + height="23" + image_overlay="Move_Walk_Off" + image_selected="PushButton_Selected_Press" + label="" + layout="topleft" + name="mode_walk_btn" + left="20" + pad_right="0" + tool_tip="Walking mode" + top="2" + width="31" /> + <button + follows="left|bottom" + height="23" + image_overlay="Move_Run_Off" + image_selected="PushButton_Selected_Press" + label="" + layout="topleft" + left_pad="0" + name="mode_run_btn" + pad_left="0" + pad_right="0" + tool_tip="Running mode" + top="2" + width="31" /> + <button + follows="left|bottom" + height="23" + image_overlay="Move_Fly_Off" + image_selected="PushButton_Selected_Press" + label="" + layout="topleft" + left_pad="0" + name="mode_fly_btn" + pad_left="0" + pad_right="0" + tool_tip="Flying mode" + top="2" + width="31" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 7a0ec8282c..22b0a1783f 100644 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml @@ -1,55 +1,64 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" - height="140" + height="130" layout="topleft" - name="mute by name" - title="Mute object by name" + name="block by name" + help_topic="mute_by_name" + title="BLOCK OBJECT BY NAME" width="375"> <text type="string" length="1" - bottom_delta="50" follows="top|left" - font="SansSerif" + font="SansSerifLarge" height="16" layout="topleft" - left="20" - left_delta="25" - name="message" - right="380"> - Mute by name only affects object chat and IM, not sounds. -You must type the object's name exactly. + left="10" + top="25" + name="message"> + Block an object: </text> <line_editor type="string" length="1" follows="top|right" font="SansSerif" - height="18" + height="20" layout="topleft" left_delta="0" name="object_name" - top_pad="22" - width="320"> + top_pad="5" + width="350"> Object name </line_editor> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="16" + layout="topleft" + left="30" + name="note"> + * Only blocks object text, not sounds + </text> <button follows="bottom|left" - height="20" - label="Ok" + height="23" + label="OK" layout="topleft" - left="108" + left="155" name="OK" - top="100" - width="75" /> + top_pad="10" + width="100" /> <button follows="bottom|right" - height="20" + height="23" label="Cancel" layout="topleft" - left_pad="7" + left_pad="5" name="Cancel" - top_delta="0" - width="75" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_my_friends.xml b/indra/newview/skins/default/xui/en/floater_my_friends.xml deleted file mode 100644 index 65665c7036..0000000000 --- a/indra/newview/skins/default/xui/en/floater_my_friends.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - can_close="false" - can_resize="true" - height="390" - layout="topleft" - min_height="240" - min_width="365" - name="floater_my_friends" - save_rect="true" - single_instance="true" - title="Contacts" - width="395"> - <tab_container - follows="all" - height="364" - layout="topleft" - left="4" - name="friends_and_groups" - tab_position="top" - tab_width="80" - top="20" - width="383"> - <panel - bottom="364" - filename="panel_friends.xml" - label="Friends" - layout="topleft" - left="0" - name="friends_panel" - width="370" /> - <panel - bottom="364" - filename="panel_groups.xml" - label="Groups" - layout="topleft" - left="0" - name="groups_panel" - width="370" /> - </tab_container> -</floater> 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 f4fd6b01b4..4c5113aa55 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,32 +1,53 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- background_opaque="false"
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="0.3 0.3 0.3 1.0"
- height="300"
- layout="topleft"
- name="nearby_chat"
- save_rect="true"
- title="Nearby Chat"
- width="320">
- <panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption">
- <text
- width="140" left="25" height="20" follows="left|right|top"
- font="SansSerifBigBold" text_color="white" word_wrap="true"
- mouse_opaque="true" name="sender_name" >NEARBY CHAT </text>
- <icon top="5" left="250"
- width="20" height="20" follows="top|right"
- color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga"
- mouse_opaque="true" name="nearby_speakers_btn"/>
- <icon top="5" left="275"
- width="20" height="20" follows="top|right"
- color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga"
- mouse_opaque="true" name="tearoff_btn"/>
- <icon top="5" left="300"
- width="15" height="15" follows="top|right"
- color="1 1 1 1" enabled="true" image_name="closebox.tga"
- name="close_btn"/>
- </panel>
- <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + border_visible="false" + border="false" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" + bg_alpha_image_overlay="DkGray_66" + legacy_header_height="18" + can_minimize="true" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_close="false" + can_dock="true" + bevel_style="in" + height="300" + min_width="235" + layout="topleft" + name="nearby_chat" + help_topic="nearby_chat" + save_rect="true" + title="NEARBY CHAT" + save_dock_state="true" + save_visibility="true" + single_instance="true" + width="320"> + <check_box + bottom_delta="36" + control_name="TranslateChat" + enabled="true" + height="16" + label="Translate chat (powered by Google)" + layout="topleft" + left="5" + name="translate_chat_checkbox" + width="230" /> + <chat_history + parse_urls="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + follows="all" + left="5" + top_delta="17" + layout="topleft" + height="260" + name="chat_history" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + right_widget_pad="5" + left_widget_pad="0" + width="315" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml index cd88ec2f3f..1f9ddecac2 100644 --- a/indra/newview/skins/default/xui/en/floater_notification.xml +++ b/indra/newview/skins/default/xui/en/floater_notification.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="200" layout="topleft" min_height="50" name="notification" - title="Notifications Console" + title="NOTIFICATIONS CONSOLE" width="200"> <text_editor type="string" diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml index 92ecb5908e..e243ccd2f9 100644 --- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="500" layout="topleft" min_height="50" name="notifications_console" - title="Notifications Console" + help_topic="notifications_console" + single_instance="true" + title="NOTIFICATIONS CONSOLE" width="500"> <combo_box follows="left|right|top" @@ -24,12 +27,16 @@ left_pad="3" name="add_notification" top_delta="0" - width="50" /> + width="50" > + <button.commit_callback + function="ClickAdd" /> + </button> <layout_stack bottom="495" follows="left|right|top|bottom" layout="topleft" left="5" + orientation="vertical" name="notification_channels" right="-5" top="42" /> diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index 742934b57b..41a440aaa0 100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" default_tab_group="1" height="350" @@ -7,51 +8,58 @@ min_height="160" min_width="270" name="objectcontents" + help_topic="objectcontents" save_rect="true" - title="Object Contents" + title="OBJECT CONTENTS" width="300"> - <panel_inventory - follows="left|top|right|bottom" - height="276" - layout="topleft" - left="8" - name="object_contents" - top="44" - width="284" /> - <text + <text type="string" length="1" follows="left|top|right" font="SansSerif" + text_color="White" height="16" layout="topleft" - left_delta="0" + left="10" name="object_name" - top_delta="-20" + top="20" width="284"> [DESC]: </text> + <panel_inventory_object + background_visible="false" + draw_border="false" + follows="all" + height="276" + layout="topleft" + left="10" + name="object_contents" + top_pad="0" + width="284" /> <button follows="bottom|left" - font="SansSerifSmall" - height="20" + height="23" label="Copy To Inventory" label_selected="Copy To Inventory" layout="topleft" - left_delta="2" + left="20" name="copy_to_inventory_button" tab_group="1" - top_pad="285" - width="120" /> + top_pad="5" + width="120"> + <button.commit_callback + function="OpenObject.MoveToInventory" /> + </button> <button follows="bottom|left" - font="SansSerifSmall" - height="20" + height="23" label="Copy And Wear" label_selected="Copy And Wear" layout="topleft" left_pad="10" name="copy_and_wear_button" - top_delta="0" - width="120" /> + width="120"> + <button.commit_callback + function="OpenObject.MoveAndWear" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml new file mode 100644 index 0000000000..9db6568ee3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_close="false" + can_minimize="false" + can_tear_off="false" + height="125" + layout="topleft" + name="outgoing call" + help_topic="outgoing_call" + title="CALLING" + width="410"> + <floater.string + name="lifetime"> + 5 + </floater.string> + <floater.string + name="localchat"> + Nearby Voice Chat + </floater.string> + <floater.string + name="anonymous"> + anonymous + </floater.string> + <floater.string + name="VoiceInviteP2P"> + is calling. + </floater.string> + <floater.string + name="VoiceInviteAdHoc"> + has joined a Voice Chat call with a conference chat. + </floater.string> + <avatar_icon + enabled="false" + follows="left|top" + height="36" + image_name="icon_avatar_online.tga" + layout="topleft" + left_delta="19" + top="35" + width="36" /> + <group_icon + enabled="false" + follows="left|top" + height="36" + layout="topleft" + top="35" + width="36" /> + <text + font="SansSerifLarge" + height="20" + layout="topleft" + left="77" + name="connecting" + top="27" + visible="false" + width="315" + word_wrap="true"> +Connecting to [CALLEE_NAME] + </text> + <text + font="SansSerifLarge" + height="20" + layout="topleft" + left="77" + name="calling" + top="27" + width="315" + word_wrap="true"> +Calling [CALLEE_NAME] + </text> + <text + font="SansSerifLarge" + height="20" + layout="topleft" + left="77" + name="noanswer" + top="27" + width="315" + word_wrap="true"> +No Answer. Please try again later. + </text> + <text + font="SansSerifLarge" + height="40" + layout="topleft" + left="77" + name="nearby" + top="27" + width="315" + word_wrap="true"> + You have been disconnected from [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + </text> + <text + font="SansSerifLarge" + height="40" + layout="topleft" + left="77" + name="nearby_P2P_by_other" + top="27" + width="315" + word_wrap="true"> + Your call has ended. [RECONNECT_NEARBY] + </text> + <text + font="SansSerifLarge" + height="40" + layout="topleft" + left="77" + name="nearby_P2P_by_agent" + top="27" + width="315" + word_wrap="true"> + You have ended the call. [RECONNECT_NEARBY] + </text> + <text + font="SansSerif" + height="50" + layout="topleft" + left="77" + name="leaving" + top="62" + width="315" + word_wrap="true"> +Leaving [CURRENT_CHAT]. + </text> + <button + height="24" + label="Cancel" + label_selected="Cancel" + left="70" + layout="topleft" + name="Cancel" + left_pad="10" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index 96195c9ba1..509cffe490 100644 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml @@ -1,129 +1,127 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" - height="140" + height="200" layout="topleft" name="Give Money" + help_topic="give_money" save_rect="true" - width="300"> + width="225"> + <string + name="payee_group"> + Pay Group + </string> + <string + name="payee_resident"> + Pay Resident + </string> + <text + type="string" + length="1" + follows="left|top" + height="18" + layout="topleft" + left="12" + name="payee_label" + top="22" + width="75"> + Pay: + </text> + <icon + height="16" + width="16" + image_name="Generic_Person" + mouse_opaque="true" + name="icon_person" + tool_tip="Person" + top_pad="0" + left="10" + /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerifSmall" + height="16" + layout="topleft" + left_pad="7" + name="payee_name" + width="210"> + [FIRST] [LAST] + </text> <button - height="20" + height="23" label="L$1" label_selected="L$1" layout="topleft" - left="108" + left="25" name="fastpay 1" - top="54" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$5" label_selected="L$5" layout="topleft" left_pad="15" name="fastpay 5" - top_delta="0" width="80" /> <button - height="20" + height="23" label="L$10" label_selected="L$10" layout="topleft" - left="108" + left="25" name="fastpay 10" - top="78" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$20" label_selected="L$20" layout="topleft" left_pad="15" name="fastpay 20" - top_delta="0" - width="80" /> - <button - enabled="false" - height="20" - label="Pay" - label_selected="Pay" - layout="topleft" - left="120" - name="pay btn" - top="112" - width="80" /> - <button - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left_pad="3" - name="cancel btn" - top_delta="0" width="80" /> <text type="string" length="1" follows="left|top" - font="SansSerif" height="18" layout="topleft" - left="12" - name="payee_label" - top="7" - width="75"> - Pay resident: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="18" - layout="topleft" - left_delta="73" - name="payee_name" - top_delta="0" - width="210"> - [FIRST] [LAST] - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left="5" - name="fastpay text" - top="54" - width="95"> - Fast Pay: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="18" - layout="topleft" - left="12" + left="25" name="amount text" - top="112" - width="75"> - Amount: + top_pad="8" + width="180"> + Or, choose amount: </text> <line_editor border_style="line" - border_thickness="1" follows="left|top|right" - font="SansSerif" - height="18" + height="19" + top_pad="0" layout="topleft" - left_delta="46" + left="120" max_length="9" name="amount" - top_delta="0" - width="57" /> + width="80" /> + <button + enabled="false" + height="23" + label="Pay" + label_selected="Pay" + layout="topleft" + left="10" + name="pay btn" + top_pad="5" + width="100" /> + <button + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="5" + name="cancel btn" + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index bb91f709a3..d09a0a0535 100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml @@ -1,174 +1,152 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" - height="140" + height="220" layout="topleft" name="Give Money" + help_topic="give_money" save_rect="true" - width="300"> + width="225"> + <string + name="payee_group"> + Pay Group + </string> + <string + name="payee_resident"> + Pay Resident + </string> + <icon + height="16" + width="16" + image_name="Generic_Person" + mouse_opaque="true" + name="icon_person" + tool_tip="Person" + top_pad="24" + left="10" + /> <text type="string" length="1" follows="left|top" - font="SansSerif" - halign="right" - height="18" + height="16" layout="topleft" - left="5" - name="payee_group" - top="7" - width="75"> - Pay group: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left_delta="0" - name="payee_resident" - top_delta="0" - width="75"> - Pay resident: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="18" - layout="topleft" - left_pad="5" + left_pad="7" + top_delta="3" name="payee_name" - top_delta="0" - width="210"> - [FIRST] [LAST] + width="184"> + [FIRST] [LAST] </text> <text type="string" length="1" follows="left|top" - font="SansSerif" - halign="right" - height="18" + halign="left" + height="14" layout="topleft" - left="5" + left="34" name="object_name_label" - top="32" - width="75"> + top_pad="0" + width="180"> Via object: </text> + <icon + height="16" + width="16" + image_name="Inv_Object" + mouse_opaque="true" + name="icon_object" + tool_tip="Objects" + top_pad="0" + left="10" + /> <text type="string" length="1" follows="left|top" - font="SansSerif" - height="18" + height="16" layout="topleft" - left_pad="5" + left_pad="7" name="object_name_text" - top_delta="0" - width="210"> - ... - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left="5" - name="fastpay text" - top="54" - width="75"> - Fast Pay: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - halign="right" - height="18" - layout="topleft" - left_delta="0" - name="amount text" - top_pad="40" - width="75"> - Amount: + top_delta="3" + use_ellipses="true" + word_wrap="false" + width="188"> + My awesome object with a really damn long name </text> - <button - height="20" + <button + height="23" label="L$1" label_selected="L$1" layout="topleft" - left="85" + left="25" name="fastpay 1" - top="54" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$5" label_selected="L$5" layout="topleft" - left_pad="5" + left_pad="15" name="fastpay 5" - top_delta="0" width="80" /> <button - height="20" + height="23" label="L$10" label_selected="L$10" layout="topleft" - left="85" + left="25" name="fastpay 10" - top="78" + top_pad="8" width="80" /> <button - height="20" + height="23" label="L$20" label_selected="L$20" layout="topleft" - left_pad="5" + left_pad="15" name="fastpay 20" - top_delta="0" + width="80" /> + <text + type="string" + length="1" + follows="left|top" + height="14" + layout="topleft" + left="25" + name="amount text" + top_pad="8" + width="180"> + Or, choose amount: + </text> + <line_editor + border_style="line" + follows="left|top|right" + height="21" + top_pad="0" + layout="topleft" + left="120" + max_length="9" + name="amount" width="80" /> <button enabled="false" - follows="right|bottom" - height="20" + height="23" label="Pay" label_selected="Pay" layout="topleft" - left="140" + left="10" name="pay btn" - top="112" - width="70" /> + top_pad="5" + width="100" /> <button - follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" left_pad="5" name="cancel btn" - top_delta="0" - width="70" /> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="18" - layout="topleft" - left_delta="-130" - max_length="9" - name="amount" - top_delta="0" - width="50" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index 430cb940e5..ff454e3ebf 100644 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="180" layout="topleft" name="perm prefs" + help_topic="perm_prefs" save_rect="true" - title="Default Upload Permissions" + title="DEFAULT UPLOAD PERMISSIONS" width="315"> <panel follows="left|top|right|bottom" @@ -15,25 +17,15 @@ name="permissions" top="20" width="315"> - <button - follows="left" - height="18" - label="?" - label_selected="?" - layout="topleft" - left="260" - name="help" - top="7" - width="22" /> <check_box control_name="ShareWithGroup" height="16" label="Share with group" layout="topleft" - left_delta="-250" + left="10" name="share_with_group" - top_delta="2" - width="106" /> + top="5" + width="150" /> <check_box control_name="EveryoneCopy" height="16" @@ -41,8 +33,8 @@ layout="topleft" left_delta="0" name="everyone_copy" - top_pad="16" - width="130" /> + top_pad="5" + width="150" /> <text type="string" length="1" @@ -51,8 +43,8 @@ layout="topleft" left_delta="0" name="NextOwnerLabel" - top_pad="16" - width="88"> + top_pad="5" + width="200"> Next owner can: </text> <check_box @@ -62,28 +54,32 @@ layout="topleft" left_delta="0" name="next_owner_modify" - top_pad="14" - width="78" /> + top_pad="5" + width="150" /> <check_box control_name="NextOwnerCopy" height="16" label="Copy" layout="topleft" - left_delta="78" + left_delta="0" name="next_owner_copy" - top_delta="0" - width="88" /> + top_pad="5" + width="150" > + <check_box.commit_callback + function="Perms.Copy" /> + </check_box> <check_box + enabled_control="NextOwnerCopy" control_name="NextOwnerTransfer" enabled="false" height="16" initial_value="true" label="Resell/Give away" layout="topleft" - left_delta="88" + left_delta="0" name="next_owner_transfer" - top_delta="0" - width="106" /> + top_pad="5" + width="150" /> </panel> <button height="20" @@ -93,7 +89,10 @@ left="90" name="ok" top="150" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.OK" /> + </button> <button height="20" label="Cancel" @@ -102,5 +101,8 @@ left_pad="5" name="cancel" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="Perms.Cancel" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml index 5a36ed5fd6..05559adf89 100644 --- a/indra/newview/skins/default/xui/en/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en/floater_post_process.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="400" layout="topleft" name="Post-Process Floater" - title="Post-Process Settings" + help_topic="post_process_floater" + title="POST-PROCESS SETTINGS" width="400"> <tab_container follows="left|top" @@ -22,6 +24,7 @@ layout="topleft" left="1" mouse_opaque="false" + help_topic="post_process_color_filter_tab" name="wmiColorFilterPanel" top="0" width="398"> @@ -183,6 +186,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="post_process_night_vision_tab" name="wmiNightVisionPanel" top_delta="-236" width="398"> @@ -278,6 +282,7 @@ label="Bloom" layout="topleft" left_delta="0" + help_topic="post_process_bloom_tab" name="wmiBloomPanel" top_delta="-236" width="398"> @@ -373,6 +378,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="post_process_extras_tab" name="Extras" top_delta="-236" width="398"> diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml index 91c2a41891..6f78363b25 100644 --- a/indra/newview/skins/default/xui/en/floater_postcard.xml +++ b/indra/newview/skins/default/xui/en/floater_postcard.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_minimize="false" can_resize="true" @@ -8,11 +9,12 @@ min_height="380" min_width="450" name="Postcard" - title="Email Snapshot" + help_topic="postcard" + title="EMAIL SNAPSHOT" width="450"> <floater.string name="default_subject"> - Postcard from Second Life. + Postcard from [SECOND_LIFE]. </floater.string> <floater.string name="default_message"> @@ -121,23 +123,14 @@ left_delta="0" max_length="700" name="msg_form" + word_wrap="true" top_pad="10" width="420"> Type your message here. </text_editor> - <text - type="string" - length="1" - bottom_delta="37" - follows="left|bottom" - layout="topleft" - left="12" - name="fine_print"> - If your recipient joins SL, you'll get a referral bonus. - </text> <button follows="right|bottom" - height="20" + height="23" label="Cancel" layout="topleft" name="cancel_btn" @@ -146,7 +139,7 @@ width="100" /> <button follows="right|bottom" - height="20" + height="23" label="Send" layout="topleft" left_delta="-106" diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index ba28016d8e..50d0011338 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -1,153 +1,110 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - center_horiz="true" - center_vert="true" + legacy_header_height="18" + open_centered="true" default_tab_group="1" height="460" layout="topleft" name="Preferences" + help_topic="preferences" single_instance="true" - title="Preferences" - width="620"> + title="PREFERENCES" + width="658"> <button follows="right|bottom" - height="20" + height="23" label="OK" label_selected="OK" layout="topleft" - left="335" + right="-105" name="OK" - top="435" + top="433" width="90"> <button.commit_callback function="Pref.OK" /> </button> <button follows="right|bottom" - height="20" + height="23" label="Cancel" label_selected="Cancel" layout="topleft" - left_pad="3" + left_pad="5" name="Cancel" - top_delta="0" + right="-10" width="90" > <button.commit_callback function="Pref.Cancel" /> </button> - <button - follows="right|bottom" - height="20" - label="Apply" - label_selected="Apply" - layout="topleft" - left_pad="3" - name="Apply" - top_delta="0" - width="90"> - <button.commit_callback - function="Pref.Apply" /> - </button> - <button - follows="left|bottom" - height="20" - label="About" - label_selected="About" - layout="topleft" - left_delta="-512" - name="About..." - top_delta="0" - width="90"> - <button.commit_callback - function="Floater.Show" - parameter="sl_about" /> - </button> - <button - follows="left|bottom" - height="20" - help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417" - label="Help" - label_selected="Help" - layout="topleft" - left_pad="3" - name="Help" - top_delta="0" - width="90" /> <tab_container - follows="left|top|right|bottom" + follows="all" + halign="left" height="410" layout="topleft" left="0" name="pref core" tab_group="1" tab_position="left" - tab_width="120" + tab_width="115" + tab_padding_right="0" top="21" - width="620"> + width="658"> <panel - class="panel_preference" + class="panel_preference" filename="panel_preferences_general.xml" label="General" layout="topleft" + help_topic="preferences_general_tab" name="general" /> <panel - class="panel_preference" - filename="panel_preferences_input.xml" - label="Input & Camera" - layout="topleft" - name="input" /> - <panel - class="panel_preference" - filename="panel_preferences_network.xml" - label="Network" - layout="topleft" - name="network" /> - <panel - class="panel_preference" - filename="panel_preferences_web.xml" - label="Web" - layout="topleft" - name="web" /> - <panel + class="panel_preference_graphics" filename="panel_preferences_graphics1.xml" label="Graphics" layout="topleft" + help_topic="preferences_display_tab" name="display" /> <panel class="panel_preference" - filename="panel_preferences_audio.xml" - label="Audio & Video" + filename="panel_preferences_privacy.xml" + label="Privacy" layout="topleft" - name="audio" /> + help_topic="preferences_im_tab" + name="im" /> <panel class="panel_preference" - filename="panel_preferences_chat.xml" - label="Text Chat" + filename="panel_preferences_sound.xml" + label="Sound & Media" layout="topleft" - name="chat" /> + help_topic="preferences_audio_tab" + name="audio" /> <panel class="panel_preference" - filename="panel_preferences_voice.xml" - label="Voice Chat" + filename="panel_preferences_chat.xml" + label="Chat" layout="topleft" - name="voice" /> + help_topic="preferences_chat_tab" + name="chat" /> <panel class="panel_preference" - filename="panel_preferences_im.xml" - label="Communication" + filename="panel_preferences_alerts.xml" + label="Notifications" layout="topleft" - name="im" /> + help_topic="preferences_msgs_tab" + name="msgs" /> <panel class="panel_preference" - filename="panel_preferences_popups.xml" - label="Popups" + filename="panel_preferences_setup.xml" + label="Setup" layout="topleft" - name="msgs" /> + help_topic="preferences_input_tab" + name="input" /> <panel class="panel_preference" - filename="panel_preferences_skins.xml" - label="Skins" + filename="panel_preferences_advanced.xml" + label="Advanced" layout="topleft" - name="skins" /> + help_topic="preferences_advanced1_tab" + name="advanced1" /> </tab_container> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index 50aabfc895..6dc073728b 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -1,26 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" height="85" layout="topleft" name="preview_anim" - width="300"> + help_topic="preview_anim" + width="280"> <floater.string name="Title"> Animation: [NAME] </floater.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="19" - layout="topleft" - left="93" - max_length="127" - name="desc" - top="19" - width="194" /> <text type="string" length="1" @@ -28,30 +18,42 @@ font="SansSerif" height="19" layout="topleft" - left_delta="-80" + left="10" name="desc txt" - top_delta="0" + top="25" width="80"> Description: </text> - <button + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerifSmall" height="19" - label="Play in World" + layout="topleft" + left_delta="95" + max_length="127" + name="desc" + top="19" + width="170" /> + <button + height="20" + label="Play Inworld" label_selected="Stop" layout="topleft" - left="27" + left="10" name="Anim play btn" - tool_tip="Play this animation so that others can see it." + tool_tip="Play this animation so that others can see it" top="47" - width="96" /> + width="125" /> <button - height="19" + height="20" label="Play Locally" label_selected="Stop" layout="topleft" - left_pad="54" + left_pad="5" name="Anim audition btn" - tool_tip="Play this animation so that only you can see it." + tool_tip="Play this animation so that only you can see it" top_delta="0" - width="96" /> + width="125" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_classified.xml b/indra/newview/skins/default/xui/en/floater_preview_classified.xml deleted file mode 100644 index 6fac2823e8..0000000000 --- a/indra/newview/skins/default/xui/en/floater_preview_classified.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - auto_tile="true" - height="510" - layout="topleft" - name="classified_preview" - save_rect="true" - title="Classified Information" - width="440"> - <floater.string - name="Title"> - Classified: [NAME] - </floater.string> - <panel - follows="bottom|left" - height="470" - layout="topleft" - left="0" - name="classified_details_panel" - top="20" - width="440" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_event.xml b/indra/newview/skins/default/xui/en/floater_preview_event.xml deleted file mode 100644 index 58dd43075d..0000000000 --- a/indra/newview/skins/default/xui/en/floater_preview_event.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - auto_tile="true" - height="510" - layout="topleft" - name="event_preview" - save_rect="true" - title="Event Information" - width="440"> - <floater.string - name="Title"> - Event: [NAME] - </floater.string> - <panel - follows="bottom|left" - height="470" - layout="topleft" - left="0" - name="event_details_panel" - top="20" - width="440" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index 9d183d8103..1903401988 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" - height="350" + height="460" layout="topleft" name="gesture_preview" - width="450"> + help_topic="gesture_preview" + width="280"> <floater.string name="step_anim"> Animation to play: @@ -41,12 +43,13 @@ type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" name="desc_label" - top="25" + top_pad="25" + font.style="BOLD" width="100"> Description: </text> @@ -54,20 +57,21 @@ follows="left|top" height="20" layout="topleft" - left_delta="84" + left_delta="89" name="desc" top_delta="-4" - width="330" /> + width="175" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" + font.style="BOLD" name="trigger_label" - top="54" + top_pad="10" width="100"> Trigger: </text> @@ -75,105 +79,99 @@ follows="left|top" height="20" layout="topleft" - left_delta="84" + left_delta="89" max_length="31" name="trigger_editor" top_delta="-4" - width="105" /> + width="175" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left_pad="15" + left="10" + font.style="BOLD" name="replace_text" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!" - top_delta="4" - width="200"> + top_pad="10" + width="210"> Replace with: </text> <line_editor follows="left|top" height="20" layout="topleft" - left_delta="80" + left_delta="99" max_length="31" name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" top_delta="-4" - width="130" /> + width="165" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" + font.style="BOLD" name="key_label" - top="83" - width="100"> + top_pad="10" + width="150"> Shortcut Key: </text> <combo_box height="20" label="None" layout="topleft" - left_delta="84" + left_delta="154" name="modifier_combo" top_delta="-4" - width="50" /> + width="55" /> <combo_box height="20" label="None" layout="topleft" - left_pad="10" + left_pad="4" name="key_combo" top_delta="0" - width="45" /> + width="50" /> <text type="string" length="1" follows="top|left" - font="SansSerif" + font="SansSerifSmall" height="10" layout="topleft" - left="16" + left="10" + font.style="BOLD" name="library_label" - top="112" + top_delta="25" width="100"> Library: </text> - <text - type="string" - length="1" - follows="top|left" - font="SansSerif" - height="10" - layout="topleft" - left_pad="104" - name="steps_label" - top_delta="0" - width="100"> - Steps: - </text> <scroll_list follows="top|left" - height="110" + height="60" layout="topleft" - left="16" + left="10" name="library_list" - top="132" - width="100"> + top_delta="15" + width="180"> <scroll_list.rows + name="action_animation" value="Animation" /> <scroll_list.rows + name="action_sound" value="Sound" /> <scroll_list.rows + name="action_chat" value="Chat" /> <scroll_list.rows + name="action_wait" value="Wait" /> </scroll_list> <button @@ -181,28 +179,50 @@ height="20" label="Add >>" layout="topleft" - left_pad="14" + left_pad="10" name="add_btn" - top_delta="0" - width="80" /> + top_delta="-1" + width="70" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="10" + layout="topleft" + left="10" + font.style="BOLD" + name="steps_label" + top_pad="50" + width="100"> + Steps: + </text> + <scroll_list + follows="top|left" + height="85" + layout="topleft" + left="10" + name="step_list" + top_pad="5" + width="180" /> <button follows="top|left" height="20" - label="Move Up" + label="Up" layout="topleft" - left_delta="0" + left_pad="10" name="up_btn" - top_pad="10" - width="80" /> + top_delta="-1" + width="70" /> <button follows="top|left" height="20" - label="Move Down" + label="Down" layout="topleft" left_delta="0" name="down_btn" top_pad="10" - width="80" /> + width="70" /> <button follows="top|left" height="20" @@ -211,52 +231,32 @@ left_delta="0" name="delete_btn" top_pad="10" - width="80" /> - <scroll_list - follows="top|left" - height="110" - layout="topleft" - left="220" - name="step_list" - top="132" - width="210" /> + width="70" /> <text - type="string" - length="1" follows="top|left" - font="SansSerif" height="60" layout="topleft" - left="16" - name="help_label" - top="252" - width="200"> - All steps happen simultaneously, -unless you add wait steps. - </text> - <text - follows="top|left" - height="60" - layout="topleft" - left_pad="6" + left="15" name="options_text" - top_delta="0" - width="205" /> + top="315" + width="205"> + (options) + </text> <combo_box follows="top|left" height="20" layout="topleft" - left_delta="10" + left_delta="15" name="animation_list" - top="272" - width="100" /> + top="330" + width="100"/> <combo_box follows="top|left" height="20" layout="topleft" left_delta="0" name="sound_list" - top_delta="0" + top="330" width="100" /> <line_editor follows="top|left" @@ -265,7 +265,7 @@ unless you add wait steps. left_delta="0" max_length="127" name="chat_editor" - top_delta="0" + top="330" width="100" /> <radio_group draw_border="false" @@ -274,7 +274,7 @@ unless you add wait steps. layout="topleft" left_pad="8" name="animation_trigger_type" - top_delta="0" + top="330" width="80"> <radio_item height="16" @@ -282,7 +282,7 @@ unless you add wait steps. layout="topleft" left="3" name="start" - top="-11" + top_delta="45" width="80" /> <radio_item height="16" @@ -290,7 +290,7 @@ unless you add wait steps. layout="topleft" left_delta="0" name="stop" - top_pad="10" + top_pad="3" width="80" /> </radio_group> <check_box @@ -298,37 +298,51 @@ unless you add wait steps. height="20" label="until animations are done" layout="topleft" - left="232" + left="28" name="wait_anim_check" - top="267" + top="330" width="100" /> <check_box follows="top|left" height="20" - label="time in seconds" + label="time in seconds:" layout="topleft" left_delta="0" name="wait_time_check" top_delta="20" - width="100" /> + width="115" /> <line_editor follows="top|left" height="20" layout="topleft" - left_pad="5" + left_pad="10" max_length="15" name="wait_time_editor" - top_delta="0" + top_delta="1" width="50" /> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="30" + layout="topleft" + left="10" + name="help_label" + top_pad="20" + word_wrap="true" + width="265"> + All steps happen simultaneously, unless you add wait steps. + </text> <check_box follows="top|left" height="20" label="Active" layout="topleft" - left="140" + left="20" name="active_check" tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys. Gestures usually become inactive when there is a key binding conflict." - top="323" + top_pad="0" width="100" /> <button follows="top|left" @@ -348,4 +362,4 @@ unless you add wait steps. name="save_btn" top_delta="0" width="80" /> -</floater> +</floater>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 3327dc8c8b..e5a5fab9b9 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_resize="true" default_tab_group="1" @@ -9,34 +10,31 @@ min_height="243" min_width="234" name="preview notecard" - title="Note:" + help_topic="preview_notecard" + title="NOTECARD:" width="400"> <floater.string name="no_object"> - Unable to find object containing this note. + Unable to find object containing this notecard. </floater.string> <floater.string name="not_allowed"> - You are not allowed to view this note. + You do not have permission to view this notecard. </floater.string> <floater.string name="Title"> Notecard: [NAME] </floater.string> - <floater.string - name="Save"> - Save - </floater.string> <icon follows="top|right" - height="16" - image_name="icon_lock.tga" + height="18" + image_name="Lock" layout="topleft" - left="344" + left="322" mouse_opaque="true" name="lock" - top="3" - width="16" /> + top="4" + width="18" /> <text type="string" length="1" @@ -44,10 +42,10 @@ font="SansSerif" height="19" layout="topleft" - left="13" + left="10" name="desc txt" - top="19" - width="80"> + top="22" + width="90"> Description: </text> <line_editor @@ -55,13 +53,12 @@ border_thickness="1" follows="left|top|right" font="SansSerif" - height="19" + height="22" layout="topleft" - left_delta="80" + left_pad="0" max_length="127" name="desc" - top_delta="0" - width="294" /> + width="296" /> <text_editor type="string" length="1" @@ -74,6 +71,7 @@ left="4" max_length="65536" name="Notecard Editor" + parse_urls="false" tab_group="1" top="46" width="392" @@ -81,25 +79,23 @@ Loading... </text_editor> <button - follows="left|bottom" - height="20" - label="Discard" - label_selected="Discard" + follows="right|bottom" + height="22" + label="Save" + label_selected="Save" layout="topleft" - left="9" - name="Discard" + left="178" + name="Save" top="332" width="100" /> <button - enabled="false" - follows="left|bottom" - height="20" - label="Keep" - label_selected="Keep" + follows="right|bottom" + height="22" + label="Delete" + label_selected="Delete" layout="topleft" - left_pad="5" - mouse_opaque="false" - name="Keep" - top_delta="0" + left="288" + name="Delete" + top="332" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 07a50ac589..f3be8c4131 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -1,26 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" height="85" layout="topleft" name="preview_sound" - width="300"> + help_topic="preview_sound" + width="280"> <floater.string name="Title"> Sound: [NAME] </floater.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="19" - layout="topleft" - left="95" - max_length="127" - name="desc" - top="19" - width="192" /> <text type="string" length="1" @@ -28,34 +18,45 @@ font="SansSerif" height="19" layout="topleft" - left_delta="-82" + left="10" + top="22" name="desc txt" - top_delta="0" - width="80"> + width="90"> Description: </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerif" + height="19" + layout="topleft" + left_pad="0" + max_length="127" + name="desc" + width="170" /> <button follows="left|top" - height="19" - label="Play Locally" - label_selected="Play Locally" + height="22" + label="Play Inworld" + label_selected="Play Inworld" layout="topleft" - left="168" - name="Sound audition btn" + name="Sound play btn" sound_flags="0" - tool_tip="Play this sound so that only you can hear it." - top="51" - width="120" /> + top="55" + left="10" + tool_tip="Play this sound so that others can hear it" + width="125" /> <button follows="left|top" - height="19" - label="Play in World" - label_selected="Play in World" + height="22" + label="Play Locally" + label_selected="Play Locally" layout="topleft" - left_delta="-126" - name="Sound play btn" + name="Sound audition btn" sound_flags="0" - tool_tip="Play this sound so that others can hear it." - top_delta="0" - width="120" /> + tool_tip="Play this sound so that only you can hear it" + left_pad="10" + width="125" /> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index 661dc63b3d..7fd7eab867 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_resize="true" - follows="left|bottom" - height="331" + follows="left|top" + height="350" layout="topleft" - min_height="120" - min_width="300" + min_height="200" + min_width="370" name="preview_texture" - width="300"> - <floater.string + help_topic="preview_texture" + width="370"> + <floater.string name="Title"> Texture: [NAME] </floater.string> @@ -24,10 +26,10 @@ font="SansSerif" height="19" layout="topleft" - left="13" + left="10" name="desc txt" top="21" - width="80"> + width="90"> Description: </text> <line_editor @@ -37,41 +39,98 @@ font="SansSerif" height="19" layout="topleft" - left_delta="80" + left_pad="0" max_length="127" name="desc" - top_delta="-2" - width="194" /> + width="190" /> + <text + type="string" + halign="right" + length="1" + follows="right|bottom" + height="16" + layout="topleft" + left="110" + name="dimensions" + top="255" + width="200"> + [WIDTH]px x [HEIGHT]px + </text> + <text + type="string" + halign="right" + length="1" + follows="right|bottom" + height="16" + layout="topleft" + left_delta="-110" + name="aspect_ratio" + top_pad="5" + width="200"> + Preview aspect ratio + </text> + <combo_box + allow_text_entry="true" + top_delta="-3" + follows="right|bottom" + height="23" + left_pad="10" + max_chars="20" + mouse_opaque="true" + enabled="true" + width="108" + name="combo_aspect_ratio" + tool_tip="Preview at a fixed aspect ratio"> + <combo_item name="Unconstrained" value="Unconstrained"> + Unconstrained + </combo_item> + <combo_item name="1:1" value="1:1" tool_tip="Group insignia or Real World profile"> + 1:1 + </combo_item> + <combo_item name="4:3" value="4:3" tool_tip="[SECOND_LIFE] profile"> + 4:3 + </combo_item> + <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> + 10:7 + </combo_item> + <combo_item name="3:2" value="3:2" tool_tip="About land"> + 3:2 + </combo_item> + <combo_item name="16:10" value="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" value="16:9" tool_tip="Profile picks"> + 16:9 + </combo_item> + <combo_item name="2:1" value="2:1"> + 2:1 + </combo_item> + </combo_box> <button - follows="left|bottom" - height="20" + follows="right|bottom" + height="22" + label="OK" + layout="topleft" + left="6" + name="Keep" + top_pad="5" + width="110" /> + <button + follows="right|bottom" + height="22" label="Discard" - label_selected="Discard" layout="topleft" - left="9" + left_pad="5" name="Discard" - top="302" - width="100" /> + top_delta="0" + width="110" /> <button - follows="left|bottom" - height="20" - label="Keep" - label_selected="Keep" + follows="right|bottom" + height="22" + label="Save As" layout="topleft" left_pad="5" - name="Keep" + name="save_tex_btn" top_delta="0" - width="100" /> - <text - type="string" - length="1" - follows="left|bottom" - height="14" - layout="topleft" - left="13" - name="dimensions" - top="287" - width="163"> - Dimensions: [WIDTH] x [HEIGHT] - </text> + width="110" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml new file mode 100644 index 0000000000..6ce9ed6e77 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + height="200" + layout="topleft" + name="publish_classified" + title="Publishing Classified" + width="320"> + <text + top="20" + follows="top|left" + font="SansSerif" + height="60" + layout="topleft" + left="15" + word_wrap="true" + name="explanation_text"> + +Your classified ad will run for one week from the date it is published. + +Remember, Classified fees are non-refundable. + + </text> + <spinner + decimal_digits="0" + follows="left|top" + font="SansSerif" + halign="left" + height="23" + increment="1" + label_width="50" + label="Price: L$ " + v_pad="10" + layout="topleft" + left="15" + value="50" + min_val="50" + max_val="99999" + name="price_for_listing" + top_pad="10" + tool_tip="Price for listing." + width="150" /> + <button + follows="top|left" + height="22" + label="Publish" + layout="topleft" + left="105" + name="publish_btn" + top="160" + width="100" /> + <button + follows="top|left" + height="22" + label="Cancel" + layout="topleft" + left_pad="5" + name="cancel_btn" + width="100" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index 48694e5fb6..32fb6f97e7 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="512" + legacy_header_height="18" + height="555" + help_topic="regioninfo" layout="topleft" name="regioninfo" save_rect="true" - title="Region/Estate" - width="480"> + title="REGION/ESTATE" + width="530"> <tab_container - bottom="512" + bottom="555" follows="left|right|top|bottom" layout="topleft" left="1" 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 4c036f98e5..21c0bfef48 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="590" + legacy_header_height="18" + height="580" layout="topleft" name="floater_report_abuse" - title="Report Abuse" - width="390"> + help_topic="floater_report_abuse" + title="REPORT ABUSE" + width="333"> <floater.string name="Screenshot"> Screenshot @@ -13,30 +15,32 @@ allow_no_texture="true" default_image_name="None" follows="left|top" - height="114" + height="150" layout="topleft" - left="238" + left="60" name="screenshot" - top="36" - width="134" /> + top="15" + width="220" /> <check_box - height="16" - label="Include screenshot" + height="15" + label="Use this screenshot" layout="topleft" - left="13" + left="8" name="screen_check" - top="134" + top_pad="-12" width="116" /> <text type="string" length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left_delta="3" + left="10" name="reporter_title" - top_delta="-102" - width="50"> + top_pad="0" + width="100"> Reporter: </text> <text @@ -45,22 +49,26 @@ follows="left|top" height="16" layout="topleft" - left_pad="12" + left_pad="5" name="reporter_field" top_delta="0" - width="150"> - Loremipsum Dolorsitamut + translate="false" + use_ellipses="true" + width="200"> + Loremipsum Dolorsitamut Longnamez </text> <text type="string" length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left="16" + left="10" name="sim_title" - top="48" - width="60"> + top_pad="2" + width="100"> Region: </text> <text @@ -69,10 +77,11 @@ follows="left|top" height="16" layout="topleft" - left_pad="2" + left_pad="5" name="sim_field" top_delta="0" - width="120"> + use_ellipses="true" + width="200"> Region Name </text> <text @@ -80,11 +89,13 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left="16" + left="10" name="pos_title" - top="64" - width="50"> + top_pad="2" + width="100"> Position: </text> <text @@ -93,44 +104,46 @@ follows="left|top" height="16" layout="topleft" - left_pad="12" + left_pad="5" name="pos_field" top_delta="0" - width="120"> + width="200"> {128.1, 128.1, 15.4} </text> - <text + <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="16" + left="10" name="select_object_label" - top="82" - width="220"> - Click the button then the object: + top_pad="2" + width="310"> + Click the button, then the abusive object: </text> <button height="32" layout="topleft" left_delta="0" name="pick_btn" - picture_style="true" + image_overlay="Inv_Object" tool_tip="Object Picker - Identify an object as the subject of this report" - top_delta="14" + top_pad="0" width="32" /> <text type="string" length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left_pad="5" + left="48" name="object_name_label" top_delta="0" - width="60"> - Name: + width="80"> + Object: </text> <text type="string" @@ -141,7 +154,9 @@ left_pad="6" name="object_name" top_delta="0" - width="109"> + translate="false" + use_ellipses="true" + width="185"> Consetetur Sadipscing </text> <text @@ -149,11 +164,13 @@ length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left="53" + left="48" name="owner_name_label" - top="112" - width="60"> + top_pad="0" + width="80"> Owner: </text> <text @@ -165,290 +182,337 @@ left_pad="6" name="owner_name" top_delta="0" - width="109"> - Hendrerit Vulputate + translate="false" + use_ellipses="true" + width="185"> + Hendrerit Vulputate Kamawashi Longname </text> <combo_box - height="20" + height="23" layout="topleft" - left="16" + left="10" name="category_combo" tool_tip="Category -- select the category that best describes this report" - top="156" - width="356"> + top_pad="5" + width="313"> <combo_box.item label="Select category" + name="Select_category" value="0" /> <combo_box.item label="Age > Age play" + 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 label="Assault > Combat sandbox / unsafe area" + name="Assault__Combat_sandbox___unsafe_area" value="34" /> <combo_box.item label="Assault > Safe area" + name="Assault__Safe_area" value="35" /> <combo_box.item label="Assault > Weapons testing sandbox" + name="Assault__Weapons_testing_sandbox" value="36" /> <combo_box.item label="Commerce > Failure to deliver product or service" + name="Commerce__Failure_to_deliver_product_or_service" value="38" /> <combo_box.item label="Disclosure > Real world information" + name="Disclosure__Real_world_information" value="39" /> <combo_box.item label="Disclosure > Remotely monitoring chat" + name="Disclosure__Remotely_monitoring chat" value="40" /> <combo_box.item label="Disclosure > Second Life information/chat/IMs" + name="Disclosure__Second_Life_information_chat_IMs" value="41" /> <combo_box.item label="Disturbing the peace > Unfair use of region resources" + name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42" /> <combo_box.item label="Disturbing the peace > Excessive scripted objects" + name="Disturbing_the_peace__Excessive_scripted_objects" value="43" /> <combo_box.item label="Disturbing the peace > Object littering" + name="Disturbing_the_peace__Object_littering" value="44" /> <combo_box.item label="Disturbing the peace > Repetitive spam" + name="Disturbing_the_peace__Repetitive_spam" value="45" /> <combo_box.item label="Disturbing the peace > Unwanted advert spam" + name="Disturbing_the_peace__Unwanted_advert_spam" value="46" /> <combo_box.item label="Fraud > L$" + name="Fraud__L$" value="47" /> <combo_box.item label="Fraud > Land" + name="Fraud__Land" value="48" /> <combo_box.item label="Fraud > Pyramid scheme or chain letter" + name="Fraud__Pyramid_scheme_or_chain_letter" value="49" /> <combo_box.item label="Fraud > US$" + name="Fraud__US$" value="50" /> <combo_box.item label="Harassment > Advert farms / visual spam" + name="Harassment__Advert_farms___visual_spam" value="51" /> <combo_box.item label="Harassment > Defaming individuals or groups" + name="Harassment__Defaming_individuals_or_groups" value="52" /> <combo_box.item label="Harassment > Impeding movement" + name="Harassment__Impeding_movement" value="53" /> <combo_box.item label="Harassment > Sexual harassment" + name="Harassment__Sexual_harassment" value="54" /> <combo_box.item label="Harassment > Solicting/inciting others to violate ToS" + name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55" /> <combo_box.item label="Harassment > Verbal abuse" + name="Harassment__Verbal_abuse" value="56" /> <combo_box.item label="Indecency > Broadly offensive content or conduct" + name="Indecency__Broadly_offensive_content_or_conduct" value="57" /> <combo_box.item label="Indecency > Inappropriate avatar name" + name="Indecency__Inappropriate_avatar_name" value="59" /> <combo_box.item label="Indecency > Inappropriate content or conduct in a PG region" + name="Indecency__Mature_content_in_PG_region" value="60" /> <combo_box.item - label="Indecency > Inappropriate content or conduct in a Mature region" + label="Indecency > Inappropriate content or conduct in a Moderate region" + name="Indecency__Inappropriate_content_in_Mature_region" value="69" /> <combo_box.item label="Intellectual property infringement > Content Removal" + name="Intellectual_property_infringement_Content_Removal" value="66" /> <combo_box.item label="Intellectual property infringement > CopyBot or Permissions Exploit" + name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37" /> <combo_box.item label="Intolerance" + name="Intolerance" value="61" /> <combo_box.item label="Land > Abuse of sandbox resources" + name="Land__Abuse_of_sandbox_resources" value="62" /> <combo_box.item label="Land > Encroachment > Objects/textures" + name="Land__Encroachment__Objects_textures" value="63" /> <combo_box.item label="Land > Encroachment > Particles" + name="Land__Encroachment__Particles" value="64" /> <combo_box.item label="Land > Encroachment > Trees/plants" + name="Land__Encroachment__Trees_plants" value="65" /> <combo_box.item label="Wagering/gambling" + name="Wagering_gambling" value="67" /> <combo_box.item label="Other" + name="Other" value="68" /> </combo_box> <text type="string" length="1" follows="left|top" - height="16" + height="14" + font.name="SansSerif" + font.style="BOLD" layout="topleft" left_delta="0" name="abuser_name_title" - top_pad="10" - width="180"> + top_pad="6" + width="313"> Abuser name: </text> <line_editor border_style="line" border_thickness="1" follows="left|top" - height="16" + height="23" layout="topleft" left_delta="0" max_length="32" name="abuser_name_edit" - top_pad="2" - width="180" /> + top_pad="0" + width="195" /> <button - height="20" - label="Choose Resident" + height="23" + label="Choose" layout="topleft" - left_pad="10" + left_pad="5" name="select_abuser" tool_tip="Select the name of the abuser from a list" - top_delta="-2" - width="160" /> - <check_box - height="16" + top_delta="0" + width="100" /> +<!-- <check_box + height="23" label="Don't know abuser's name" layout="topleft" - left="13" + left="10" name="omit_abuser_name" tool_tip="Check this if you are unable to provide the abuser's name" - top="224" + top_pad="2" visible="false" - width="116" /> + width="250" />--> <text type="string" length="1" follows="left|top" - height="16" + height="14" + font.name="SansSerif" + font.style="BOLD" layout="topleft" - left_delta="3" + left="10" name="abuser_name_title2" - top_pad="8" - width="180"> + top_pad="2" + width="313"> Location of Abuse: </text> <line_editor border_style="line" border_thickness="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="0" + left="10" max_length="256" name="abuse_location_edit" - top_pad="2" - width="356" /> + top_pad="0" + width="313" /> <text type="string" length="1" follows="left|top" height="16" + font.name="SansSerif" + font.style="BOLD" layout="topleft" left_delta="0" name="sum_title" - top_pad="8" - width="180"> + top_pad="2" + width="313"> Summary: </text> <line_editor border_style="line" border_thickness="1" follows="left|top" - height="16" + height="23" layout="topleft" left_delta="0" max_length="64" name="summary_edit" - top_pad="2" - width="356" /> + top_pad="0" + width="313" /> <text type="string" length="1" follows="left|top" - height="16" + height="14" + font.name="SansSerif" + font.style="BOLD" layout="topleft" left_delta="0" name="dscr_title" - top_pad="8" - width="180"> + top_pad="6" + width="50"> Details: </text> <text type="string" length="1" follows="left|top" - height="48" + height="22" layout="topleft" - left_delta="54" name="bug_aviso" - top_delta="0" - width="308"> - Please be specific about the date, location, nature of -abuse, relevant chat/IM text, and select the object -if possible. + left_pad="10" + word_wrap="true" + width="270"> + Please be as specific as possible </text> <text_editor follows="left|top" - height="146" + height="75" layout="topleft" - left="16" + left="10" max_length="800" mouse_opaque="false" name="details_edit" - top="386" - width="356" + width="313" word_wrap="true" /> <text type="string" length="1" follows="left|top" - height="16" + height="30" layout="topleft" - left_delta="0" + left="10" + font.name="SansSerifSmall" name="incomplete_title" - top_pad="8" - width="342"> - Note: Incomplete reports will not be investigated. + top_pad="2" + word_wrap="true" + width="313"> + * Incomplete reports won't be investigated </text> - <button - bottom="580" - follows="right|bottom" - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - name="cancel_btn" - right="373" - width="150" /> - <button - bottom="580" - follows="right|bottom" - height="20" + <button + left="80" + follows="left|top" + height="23" + top="550" label="Report Abuse" label_selected="Report Abuse" layout="topleft" name="send_btn" - right="217" - width="150" /> + width="140" /> + <button + follows="left|top" + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + name="cancel_btn" + left_pad="5" + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml new file mode 100644 index 0000000000..12ade86b5f --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + background_visible="true" + follows="left|top|right|bottom" + height="250" + layout="topleft" + left="0" + name="script_floater" + top="0" + can_dock="true" + can_minimize="true" + visible="false" + width="350" + can_resize="false" + min_width="350" + min_height="200"> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml index 2ae0afa168..53d4925214 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml @@ -4,6 +4,7 @@ height="233" layout="topleft" name="script debug floater" + help_topic="script_debug_floater" save_rect="true" title="Script Warning/Error" width="450"> diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index 2dd7a1e777..d1db5c17ba 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -1,20 +1,24 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" follows="left|top|right|bottom" height="200" layout="topleft" name="script" - short_title="[All scripts]" - title="[All scripts]" + help_topic="script" + short_title="[ALL SCRIPTS]" + title="[ALL SCRIPTS]" width="440"> <text_editor bottom="197" follows="left|top|right|bottom" height="176" layout="topleft" - max_length="10000" + max_length="2147483647" name="Chat History Editor" + parse_highlights="true" + read_only="true" width="420" word_wrap="true" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml new file mode 100644 index 0000000000..6b36cdfcc5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="570" + help_topic="scriptlimits" + layout="topleft" + name="scriptlimits" + save_rect="true" + title="SCRIPT INFORMATION" + width="480"> + <tab_container + bottom="555" + follows="left|right|top|bottom" + layout="topleft" + left="1" + name="scriptlimits_panels" + right="-1" + tab_position="top" + top="20" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml index cb3ff92363..d0cd00d147 100644 --- a/indra/newview/skins/default/xui/en/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_resize="true" - height="550" + height="570" layout="topleft" - left_delta="343" min_height="271" min_width="290" name="preview lsl text" + help_topic="preview_lsl_text" save_rect="true" - title="Script: Rotation Script" - top_delta="0" - width="500"> + title="SCRIPT: ROTATION SCRIPT" + width="508"> <floater.string name="Title"> - Script: [NAME] + SCRIPT: [NAME] </floater.string> <panel follows="left|top|right|bottom" - height="508" + height="522" layout="topleft" - left="0" + left="10" name="script panel" top="42" width="497" /> <icon follows="top|right" - height="16" - image_name="icon_lock.tga" + height="18" + image_name="Lock" layout="topleft" - left="444" + left="426" mouse_opaque="true" name="lock" - top="3" - width="16" /> + top="4" + width="18" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml index ad91e8156b..60a26fcf1d 100644 --- a/indra/newview/skins/default/xui/en/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" auto_tile="true" can_resize="true" height="400" layout="topleft" name="queue" + help_topic="queue" save_rect="true" - title="Reset Progress" + title="RESET PROGRESS" width="300"> <floater.string name="Starting"> diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml index bb0c60e75b..ade0156bc7 100644 --- a/indra/newview/skins/default/xui/en/floater_script_search.xml +++ b/indra/newview/skins/default/xui/en/floater_script_search.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" default_tab_group="1" height="120" layout="topleft" name="script search" - title="Script Search" + help_topic="script_search" + title="SCRIPT SEARCH" width="300"> <check_box control_name="LSLFindCaseInsensitivity" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml new file mode 100644 index 0000000000..8770ede7e9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="13" + can_resize="true" + height="600" + layout="topleft" + min_height="400" + min_width="450" + name="floater_search" + help_topic="floater_search" + save_rect="true" + save_visibility="true" + single_instance="true" + title="FIND" + width="650"> + <floater.string + name="loading_text"> + Loading... + </floater.string> + <floater.string + name="done_text"> + Done + </floater.string> + <layout_stack + height="580" + follows="left|right|top|bottom" + layout="topleft" + left="10" + name="stack1" + top="20" + width="630"> + <layout_panel + height="570" + layout="topleft" + left_delta="0" + top_delta="0" + name="browser_layout" + user_resize="false" + width="630"> + <web_browser + trusted_content="true" + follows="left|right|top|bottom" + layout="topleft" + left="0" + name="browser" + top="0" + height="540" + width="630" /> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="0" + name="status_text" + top_pad="10" + width="150" /> + <text + visible="false" + follows="bottom|right" + height="16" + left_delta="0" + name="refresh_search" + left_pad="0" + right="-10" + halign="right" + width="450"> + Redo search to reflect current God level + </text> + </layout_panel> + </layout_stack> +</floater> 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 b89af0ef3e..4e89df5a73 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -1,32 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - border="true" + legacy_header_height="18" + border="false" can_close="false" can_minimize="false" - height="100" + height="90" layout="topleft" name="modal container" width="240"> - <button - height="20" - label="Cancel" - label_selected="Cancel" - layout="topleft" - left="138" - name="Cancel" - top="70" - width="82" /> <text type="string" + halign="center" length="1" follows="left|top" - font="SansSerif" - height="16" + height="30" layout="topleft" - left="20" + left="30" name="Save item as:" - top="10" - width="200"> - Press a key to select + top="25" + word_wrap="true" + width="180"> + Press a key to set your Speak button trigger. </text> + <button + height="23" + label="Cancel" + label_selected="Cancel" + layout="topleft" + right="-10" + name="Cancel" + top_pad="8" + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 26c805c0f7..4cae42bcfe 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -1,131 +1,110 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" - height="485" + can_resize="true" + height="535" layout="topleft" name="sell land" - title="Sell Land" - width="450"> + help_topic="sell_land" + single_instance="true" + title="SELL LAND" + width="313"> + <scroll_container + color="DkGray2" + follows="left|top|right|bottom" + height="520" + layout="topleft" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + top="15" + width="313"> + <panel + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + left="0" + width="293" + height="615"> <texture_picker enabled="false" follows="top|left" height="135" - layout="topleft" - left="244" + left="60" name="info_image" - right="424" - top="40" + top="20" width="180" /> <text - type="string" - length="1" - bottom_delta="-144" + top="150" follows="top|left" - layout="topleft" left="16" name="info_parcel_label" width="48"> Parcel: </text> <text - type="string" - length="1" - bottom_delta="5" + top_delta="0" follows="top|left" - font="SansSerif" height="16" - layout="topleft" left="56" name="info_parcel" right="-20"> PARCEL NAME </text> <text - type="string" - length="1" follows="top|left" - layout="topleft" left="16" name="info_size_label" width="48"> Size: </text> <text - type="string" - length="1" - bottom_delta="21" follows="top|left" - font="SansSerif" + top_delta="0" height="32" - layout="topleft" left="56" name="info_size" right="-20"> - [AREA] sq. m. + [AREA] m² </text> <text - type="string" - length="1" follows="top|left" - font="SansSerifHuge" + font="SansSerifBig" height="24" - layout="topleft" left="16" name="info_action" text_color="white" - top="141" + top="195" width="200"> To sell this parcel: </text> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_price" - top="167" - width="64" /> <text - type="string" - length="1" - bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" - layout="topleft" - left="72" - name="price_label" - right="-20"> - Set a price: + left="30" + name="price_label"> + 1. Set a price: </text> <text - type="string" - length="1" follows="top|left" height="16" - layout="topleft" - left="72" - name="price_text" - right="-20"> - Choose an appropriate price for this land. + left="40" + name="price_text"> + Choose an appropriate price. </text> <text - type="string" - length="1" height="16" - layout="topleft" - left="72" + left="40" name="price_ld" width="20"> L$ </text> <line_editor - type="string" - length="1" follows="top|left" - height="16" - layout="topleft" + height="18" left_delta="20" name="price" top_delta="0" @@ -133,163 +112,122 @@ 0 </line_editor> <text - type="string" - length="1" height="16" - layout="topleft" - left_pad="10" + left="40" name="price_per_m" - top_delta="0" + top_delta="25" width="200"> - (L$[PER_METER] per square meter) + (L$[PER_METER] per m²) </text> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_sell_to" - width="64" /> <text - type="string" - length="1" - bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" - layout="topleft" - left="72" - name="sell_to_label" - right="-20"> - Sell the land to: + left="30" + name="sell_to_label"> + 2. Sell the land to: </text> <text - type="string" - length="1" follows="top|left" - height="16" - layout="topleft" - left="72" + height="25" + left="40" + word_wrap="true" name="sell_to_text" right="-20"> Choose whether to sell to anyone or a particular buyer. </text> <combo_box - follows="top|right" - height="16" - layout="topleft" + follows="top|left" + height="18" left_delta="0" name="sell_to" - top_delta="16" - width="140"> + top_delta="32" + width="130"> <combo_box.item enabled="false" - label="select one --" + label="- Select one -" + name="--selectone--" value="select" /> <combo_box.item label="Anyone" + name="Anyone" value="anyone" /> <combo_box.item - label="Specific user:" + label="Specific person:" + name="Specificuser:" value="user" /> </combo_box> <line_editor enabled="false" - follows="top|right" - height="16" - layout="topleft" + follows="top|left" + height="18" left_delta="0" name="sell_to_agent" top_pad="4" - width="150" /> + width="130" /> <button - height="16" - label="Select..." - layout="topleft" + height="20" + label="Select" left_pad="5" name="sell_to_select_agent" top_delta="0" width="60" /> - <icon - follows="top|left" - height="64" - image_name="badge_note.j2c" - layout="topleft" - left="0" - name="step_sell_objects" - width="64" /> <text - type="string" - length="1" - bottom_delta="-38" follows="top|left" - font="SansSerifBig" + font="SansSerif" height="16" - layout="topleft" - left="72" - name="sell_objects_label" - right="-20"> - Sell the objects with the land? + left="30" + name="sell_objects_label"> + 3. Sell the objects with the land? </text> <text - type="string" - length="1" - bottom_delta="20" + font="SansSerifSmall" follows="top|left" - height="16" - layout="topleft" - left="72" + height="25" + word_wrap="true" + left="40" name="sell_objects_text"> Land owner's transferable objects on parcel will change ownership. </text> <radio_group - bottom_delta="44" - follows="top|right" + top_pad="5" + follows="top|left" height="40" - layout="topleft" - left="72" + left="40" name="sell_objects" - right="420"> + right="-20"> <radio_item bottom="40" height="0" - layout="topleft" left="10" name="none" visible="false" /> <radio_item - bottom="20" + top_pad="10" height="16" label="No, keep ownership of objects" - layout="topleft" left="10" name="no" /> <radio_item - bottom="40" + top_pad="10" height="16" label="Yes, sell objects with land" - layout="topleft" left="10" name="yes" /> </radio_group> <button - height="16" + height="20" label="Show Objects" - layout="topleft" name="show_objects" - right="414" - top="393" + left="70" + top_pad="10" width="110" /> <text - type="string" - length="1" - bottom_delta="35" + bottom_delta="30" follows="top|left" font="SansSerifBig" height="16" - layout="topleft" - left="72" + left="16" name="nag_message_label" right="-20"> REMEMBER: All sales are final. @@ -298,18 +236,18 @@ follows="bottom|left" height="20" label="Set Land For Sale" - layout="topleft" left_delta="0" name="sell_btn" - top_pad="15" + top_pad="10" width="130" /> <button - follows="bottom|right" + follows="bottom|left" height="20" label="Cancel" - layout="topleft" - left_pad="152" + left_pad="30" name="cancel_btn" top_delta="0" width="90" /> + </panel> + </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 108d0b97e8..3ed2bd7206 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -1,47 +1,58 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="215" layout="topleft" name="settings_debug" - title="Debug Settings" + help_topic="settings_debug" + title="DEBUG SETTINGS" width="350"> <combo_box allow_text_entry="true" follows="top|left" - height="20" + height="22" layout="topleft" left="15" max_chars="255" name="settings_combo" top="30" - width="200" /> + width="320"> + <combo_box.commit_callback + function="SettingSelect" /> + </combo_box> <text_editor enabled="false" height="60" - hide_scrollbar="true" layout="topleft" left_delta="0" name="comment_text" - top_pad="15" + top_pad="10" width="320" word_wrap="true" /> - <combo_box - follows="top|left" - height="20" - layout="topleft" - left_delta="0" - name="boolean_combo" - top_pad="10" - visible="false" - width="100"> - <combo_box.item - label="TRUE" - value="true" /> - <combo_box.item - label="FALSE" - value="" /> - </combo_box> + <radio_group + follows="top|left" + height="30" + layout="topleft" + left_delta="0" + name="boolean_combo" + top_pad="10" + visible="false" + tab_stop="true" + width="100"> + <radio_item + top_pad="5" + label="TRUE" + name="TRUE" + value="true" /> + <radio_item + top_pad="5" + label="FALSE" + name="FALSE" + value="" /> + <commit_callback + function="CommitSettings" /> + </radio_group> <line_editor height="20" layout="topleft" @@ -49,14 +60,21 @@ name="val_text" top_delta="0" visible="false" - width="300" /> + width="300" > + <line_editor.commit_callback + function="CommitSettings" /> + </line_editor> <color_swatch bottom="185" can_apply_immediately="true" height="55" + name="val_color_swatch" label="Color" layout="topleft" - width="37" /> + width="37" > + <color_swatch.commit_callback + function="CommitSettings" /> + </color_swatch> <spinner height="20" label="x" @@ -66,7 +84,10 @@ name="val_spinner_1" top_delta="10" visible="false" - width="120" /> + width="120" > + <spinner.commit_callback + function="CommitSettings" /> + </spinner> <spinner height="20" label="x" @@ -76,7 +97,10 @@ name="val_spinner_2" top_delta="0" visible="false" - width="120" /> + width="120"> + <spinner.commit_callback + function="CommitSettings" /> + </spinner> <spinner height="20" label="x" @@ -86,7 +110,10 @@ name="val_spinner_3" top="160" visible="false" - width="120" /> + width="120"> + <spinner.commit_callback + function="CommitSettings" /> + </spinner> <spinner height="20" label="x" @@ -96,13 +123,19 @@ name="val_spinner_4" top_delta="0" visible="false" - width="120" /> + width="120" > + <spinner.commit_callback + function="CommitSettings" /> + </spinner> <button - height="20" + height="22" label="Reset to default" layout="topleft" left="15" name="default_btn" - top="190" - width="150" /> + top="186" + width="150" > + <button.commit_callback + function="ClickDefault" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml new file mode 100644 index 0000000000..9f14e9ae0a --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<floater + can_close="false" + can_resize="true" + min_width="333" + min_height="440" + save_rect="true" + save_visibility="true" + > +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index f3d8938ea2..857932e51a 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,160 +1,170 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" + can_close="true" follows="left|top" - height="526" + height="520" layout="topleft" name="Snapshot" + help_topic="snapshot" save_rect="true" - title="Snapshot Preview" + save_visibility="true" + title="SNAPSHOT PREVIEW" width="215"> <floater.string name="unknown"> unknown </floater.string> - <text - type="string" - length="1" - follows="top|left" - height="15" - layout="topleft" - left="10" - name="type_label" - top="25" - width="195"> - Snapshot destination - </text> <radio_group - height="60" + height="70" label="Snapshot type" layout="topleft" - left_delta="0" + left="10" name="snapshot_type_radio" - top_pad="5" - width="195"> + top="20" + width="205"> +<!-- <radio_item - bottom="19" height="16" - label="Send via email" + label="Share to Web" layout="topleft" - name="postcard" /> + name="share_to_web" + top_pad="0" /> +--> + <radio_item + height="16" + label="Email" + layout="topleft" + name="postcard" + top_pad="2" /> <radio_item - bottom="38" height="16" - label="Save to your inventory (L$[AMOUNT])" + label="My inventory (L$[AMOUNT])" layout="topleft" - name="texture" /> + name="texture" + top_pad="2" /> <radio_item - bottom="57" height="16" - label="Save to your hard drive" + label="Save to my computer" layout="topleft" - name="local" /> + name="local" + top_pad="2" /> </radio_group> + <ui_ctrl + height="90" + width="125" + layout="topleft" + name="thumbnail_placeholder" + top_pad="6" + follows="left|top" + left="10" + /> <text type="string" + font="SansSerifSmall" length="1" follows="left|top" - height="25" + height="14" layout="topleft" + right="-5" left_delta="0" + halign="right" name="file_size_label" - top_pad="106" + top_pad="8" width="195"> - File size: [SIZE] KB + [SIZE] KB </text> <button follows="left|top" - height="20" - label="Refresh Snapshot" + height="22" + image_overlay="Refresh_Off" layout="topleft" - left_delta="0" + left="10" name="new_snapshot_btn" - top_delta="15" - width="195" /> + width="23" /> <button follows="left|top" - height="20" + height="23" label="Send" layout="topleft" - left_delta="0" + left_pad="5" + right="-5" name="send_btn" - top_pad="2" - width="105" /> + width="100" /> <button follows="left|top" - height="20" + height="23" label="Save (L$[AMOUNT])" layout="topleft" - left_delta="0" + right="-5" name="upload_btn" top_delta="0" - width="105" /> + width="100" /> <flyout_button follows="left|top" - height="20" + height="23" label="Save" layout="topleft" - left_delta="0" + right="-5" name="save_btn" tool_tip="Save image to a file" top_delta="0" - width="105"> + width="100"> <flyout_button.item label="Save" + name="save_item" value="save" /> <flyout_button.item label="Save As..." + name="saveas_item" value="save as" /> </flyout_button> - <button - follows="left|top" - height="20" - label="Cancel" - layout="topleft" - left_pad="5" - name="discard_btn" - top_delta="0" - width="85" /> - <button + <button follows="left|top" - font="SansSerifSmall" - height="20" - label="More >>" + height="23" + label="More" layout="topleft" left="10" name="more_btn" - tool_tip="Advanced Options" - top="270" + tool_tip="Advanced options" width="80" /> <button follows="left|top" - font="SansSerifSmall" - height="20" - label="<< Less" + height="23" + label="Less" layout="topleft" left_delta="0" name="less_btn" - tool_tip="Advanced Options" + tool_tip="Advanced options" top_delta="0" width="80" /> + <button + follows="left|top" + height="23" + label="Cancel" + layout="topleft" + right="-5" + left_pad="5" + name="discard_btn" + width="100" /> <text type="string" length="1" follows="top|left" - height="15" + height="12" layout="topleft" - left_delta="0" + left="10" name="type_label2" top_pad="5" - width="115"> + width="127"> Size </text> <text type="string" length="1" follows="top|left" - height="15" + height="12" layout="topleft" left_pad="5" name="format_label" @@ -163,100 +173,119 @@ Format </text> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left="10" name="postcard_size_combo" - top="312" - width="115"> + width="120"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="640x480" + name="640x480" value="[i640,i480]" /> <combo_box.item label="800x600" + name="800x600" value="[i800,i600]" /> <combo_box.item label="1024x768" + name="1024x768" value="[i1024,i768]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left_delta="0" name="texture_size_combo" top_delta="0" - width="115"> + width="127"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="Small (128x128)" + name="Small(128x128)" value="[i128,i128]" /> <combo_box.item label="Medium (256x256)" + name="Medium(256x256)" value="[i256,i256]" /> <combo_box.item label="Large (512x512)" + name="Large(512x512)" value="[i512,i512]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Resolution" layout="topleft" left_delta="0" name="local_size_combo" top_delta="0" - width="115"> + width="127"> <combo_box.item label="Current Window" + name="CurrentWindow" value="[i0,i0]" /> <combo_box.item label="320x240" + name="320x240" value="[i320,i240]" /> <combo_box.item label="640x480" + name="640x480" value="[i640,i480]" /> <combo_box.item label="800x600" + name="800x600" value="[i800,i600]" /> <combo_box.item label="1024x768" + name="1024x768" value="[i1024,i768]" /> <combo_box.item label="1280x1024" + name="1280x1024" value="[i1280,i1024]" /> <combo_box.item label="1600x1200" + name="1600x1200" value="[i1600,i1200]" /> <combo_box.item label="Custom" + name="Custom" value="[i-1,i-1]" /> </combo_box> <combo_box - height="20" + height="23" label="Format" layout="topleft" left_pad="5" name="local_format_combo" - top_delta="0" width="70"> <combo_box.item - label="PNG" /> + label="PNG" + name="PNG" /> <combo_box.item - label="JPEG" /> + label="JPEG" + name="JPEG" /> <combo_box.item - label="BMP" /> + label="BMP" + name="BMP" /> </combo_box> <spinner allow_text_entry="false" @@ -265,13 +294,13 @@ height="20" increment="32" label="Width" - label_width="30" + label_width="40" layout="topleft" left="10" max_val="6016" min_val="32" name="snapshot_width" - top="337" + top_pad="10" width="95" /> <spinner allow_text_entry="false" @@ -280,7 +309,7 @@ height="20" increment="32" label="Height" - label_width="35" + label_width="40" layout="topleft" left_pad="5" max_val="6016" @@ -290,7 +319,7 @@ width="95" /> <check_box bottom_delta="20" - label="Constrain Proportions" + label="Constrain proportions" layout="topleft" left="10" name="keep_aspect_check" /> @@ -300,71 +329,75 @@ height="15" increment="1" initial_value="75" - label="Image Quality" + label="Image quality" + label_width="100" layout="topleft" left_delta="0" max_val="100" name="image_quality_slider" top_pad="5" - width="210" /> + width="205" /> <text type="string" length="1" follows="left|top" - height="20" + height="13" layout="topleft" - left_delta="0" + left="10" name="layer_type_label" - top_pad="8" + top_pad="5" width="50"> Capture: </text> <combo_box - height="20" + height="23" label="Image Layers" layout="topleft" - left_delta="50" + left="30" name="layer_types" - top_delta="-3" width="145"> <combo_box.item label="Colors" + name="Colors" value="colors" /> <combo_box.item label="Depth" + name="Depth" value="depth" /> - <combo_box.item - label="Object Mattes" - value="objects" /> </combo_box> <check_box - bottom_delta="20" - label="Show interface in snapshot" + label="Interface" layout="topleft" - left="10" + left="30" + top_pad="10" + width="180" name="ui_check" /> <check_box - bottom_delta="20" - label="Show HUD objects in snapshot" + label="HUDs" layout="topleft" - left="10" + left="30" + top_pad="10" + width="180" name="hud_check" /> <check_box - bottom_delta="20" label="Keep open after saving" layout="topleft" left="10" + top_pad="8" + width="180" name="keep_open_check" /> <check_box - bottom_delta="20" - label="Freeze frame (fullscreen preview)" + label="Freeze frame (fullscreen)" layout="topleft" left="10" + top_pad="8" + width="180" name="freeze_frame_check" /> <check_box - bottom_delta="20" label="Auto-refresh" layout="topleft" left="10" + top_pad="8" + width="180" name="auto_snapshot_check" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml index 8aff16b465..ca54ee6604 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="190" layout="topleft" name="Sound Preview" - title="sound.wav" + help_topic="sound_preview" + title="SOUND.WAV" width="300"> <text type="string" @@ -27,7 +29,7 @@ left_delta="0" max_length="63" name="name_form" - top_pad="4" + top_pad="0" width="280" /> <text type="string" @@ -38,7 +40,7 @@ left_delta="0" mouse_opaque="false" name="description_label" - top_pad="4" + top_pad="10" width="270"> Description: </text> @@ -51,25 +53,24 @@ left_delta="0" max_length="127" name="description_form" - top_pad="4" + top_pad="0" width="280" /> <button + follows="left|bottom" + height="22" + label="Upload (L$[AMOUNT])" + layout="topleft" + left="45" + name="ok_btn" + top_pad="60" + width="150" /> + <button follows="right|bottom" - height="20" + height="22" label="Cancel" label_selected="Cancel" layout="topleft" - left="200" name="cancel_btn" - top="160" + left_pad="5" width="90" /> - <button - follows="left|bottom" - height="20" - label="Upload (L$[AMOUNT])" - layout="topleft" - left_delta="-135" - name="ok_btn" - top_delta="0" - width="130" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_statistics.xml b/indra/newview/skins/default/xui/en/floater_statistics.xml deleted file mode 100644 index 1661fbffb0..0000000000 --- a/indra/newview/skins/default/xui/en/floater_statistics.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - can_resize="true" - follows="right|top" - height="392" - layout="topleft" - mouse_opaque="false" - name="stats floater" - title="Statistics" - width="250" /> diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index 08d91843f2..b87cb9a433 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" follows="top|right" height="400" layout="topleft" name="Statistics" + help_topic="statistics" save_rect="true" save_visibility="true" - title="Statistics" + title="STATISTICS" width="250"> <scroll_container follows="top|left|bottom|right" @@ -25,6 +27,667 @@ left="2" name="statistics_view" top="20" - width="230" /> + width="230" > + <stat_view + name="basic" + label="Basic" + show_label="true" + setting="OpenDebugStatBasic"> + <stat_bar + name="fps" + label="FPS" + unit_label="fps" + stat="fpsstat" + bar_min="0" + bar_max="45" + tick_spacing="7.5" + label_spacing="15.0" + precision="1" + show_bar="true" + show_history="true"> + </stat_bar> + <stat_bar + name="bandwidth" + label="Bandwidth" + unit_label="kbps" + stat="kbitstat" + bar_min="0" + bar_max="900" + tick_spacing="100" + label_spacing="300" + show_bar="true" + show_history="false"> + </stat_bar> + <stat_bar + name="packet_loss" + label="Packet Loss" + unit_label=" %" + stat="packetslostpercentstat" + bar_min="0" + bar_max="5" + tick_spacing="1" + label_spacing="1" + precision="1" + show_per_sec="false" + show_bar="false" + show_mean="true"> + </stat_bar> + <stat_bar + name="ping" + label="Ping Sim" + unit_label="msec" + stat="simpingstat" + bar_min="0" + bar_max="1000" + tick_spacing="100" + label_spacing="200" + show_bar="false" + show_per_sec="false" + show_mean="false"> + </stat_bar> + </stat_view> + <stat_view + name="advanced" + label="Advanced" + show_label="true" + setting="OpenDebugStatAdvanced"> + <stat_view + name="render" + label="Render" + show_label="true" + setting="OpenDebugStatRender"> + <stat_bar + name="ktrisframe" + label="KTris Drawn" + unit_label="/fr" + stat="trianglesdrawnstat" + bar_min="0" + bar_max="500" + tick_spacing="100" + label_spacing="500" + precision="1" + show_per_sec="false"> + </stat_bar> + <stat_bar + name="ktrissec" + label="KTris Drawn" + unit_label="/sec" + stat="trianglesdrawnstat" + bar_min="0" + bar_max="3000" + tick_spacing="250" + label_spacing="1000" + precision="1"> + </stat_bar> + <stat_bar + name="objs" + label="Total Objects" + unit_label="" + stat="numobjectsstat" + bar_min="0" + bar_max="3000" + tick_spacing="250" + label_spacing="1000" + precision="1" + show_per_sec="false" + show_bar="false"> + </stat_bar> + <stat_bar + name="newobjs" + label="New Objects" + unit_label="/sec" + stat="numnewobjectsstat" + bar_min="0" + bar_max="1000" + tick_spacing="100" + label_spacing="500" + show_per_sec="true" + show_bar="false"> + </stat_bar> + </stat_view> + <stat_view + name="texture" + label="Texture" + show_label="true"> + <stat_bar + name="numimagesstat" + label="Count" + stat="numimagesstat" + bar_min="0.f" + bar_max="8000.f" + tick_spacing="2000.f" + label_spacing="4000.f" + show_per_sec="false" + show_bar="false"> + </stat_bar> + + <stat_bar + name="numrawimagesstat" + label="Raw Count" + stat="numrawimagesstat" + bar_min="0.f" + bar_max="8000.f" + tick_spacing="2000.f" + label_spacing="4000.f" + show_per_sec="false" + show_bar="false"> + </stat_bar> + + <stat_bar + name="gltexmemstat" + label="GL Mem" + stat="gltexmemstat" + bar_min="0.f" + bar_max="400.f" + tick_spacing="100.f" + label_spacing="200.f" + precision="1" + show_per_sec="false" > + </stat_bar> + + <stat_bar + name="formattedmemstat" + label="Formatted Mem" + stat="formattedmemstat" + bar_min="0.f" + bar_max="400.f" + tick_spacing="100.f" + label_spacing="200.f" + precision="1" + show_per_sec="false" > + </stat_bar> + + <stat_bar + name="rawmemstat" + label="Raw Mem" + stat="rawmemstat" + bar_min="0.f" + bar_max="400.f" + tick_spacing="100.f" + label_spacing="200.f" + precision="1" + show_per_sec="false" > + </stat_bar> + + <stat_bar + name="glboundmemstat" + label="Bound Mem" + stat="glboundmemstat" + bar_min="0.f" + bar_max="400.f" + tick_spacing="100.f" + label_spacing="200.f" + precision="1" + show_per_sec="false" > + </stat_bar> + </stat_view> + + <stat_view + name="network" + label="Network" + show_label="true" + setting="OpenDebugStatNet"> + <stat_bar + name="packetsinstat" + label="Packets In" + stat="packetsinstat" + unit_label="/sec" + show_bar="false"> + </stat_bar> + + <stat_bar + name="packetsoutstat" + label="Packets Out" + stat="packetsoutstat" + unit_label="/sec" + show_bar="false" > + </stat_bar> + + <stat_bar + name="objectkbitstat" + label="Objects" + stat="objectkbitstat" + unit_label="kbps" + show_bar="false" > + </stat_bar> + + <stat_bar + name="texturekbitstat" + label="Texture" + stat="texturekbitstat" + unit_label="kbps" + show_bar="false" > + </stat_bar> + + <stat_bar + name="assetkbitstat" + label="Asset" + stat="assetkbitstat" + unit_label="kbps" + show_bar="false" > + </stat_bar> + + <stat_bar + name="layerskbitstat" + label="Layers" + stat="layerskbitstat" + unit_label="kbps" + show_bar="false" > + </stat_bar> + + <stat_bar + name="actualinkbitstat" + label="Actual In" + stat="actualinkbitstat" + unit_label="kbps" + bar_min="0.f" + bar_max="1024.f" + tick_spacing="128.f" + label_spacing="256.f" + show_bar="true" + show_history="false" > + </stat_bar> + + <stat_bar + name="actualoutkbitstat" + label="Actual Out" + stat="actualoutkbitstat" + unit_label="kbps" + bar_min="0.f" + bar_max="512.f" + tick_spacing="128.f" + label_spacing="256.f" + show_bar="true" + show_history="false"> + </stat_bar> + + <stat_bar + name="vfspendingoperations" + label="VFS Pending Ops" + stat="vfspendingoperations" + unit_label=" " + show_per_sec="false" + show_bar="false" > + </stat_bar> + </stat_view> + </stat_view> + + <stat_view + name="sim" + label="Simulator" + show_label="true" + setting="OpenDebugStatSim"> + <stat_bar + name="simtimedilation" + label="Time Dilation" + stat="simtimedilation" + precision="2" + bar_min="0.f" + bar_max="1.f" + tick_spacing="0.25f" + label_spacing="0.5f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simfps" + label="Sim FPS" + stat="simfps" + bar_min="0.f" + bar_max="200.f" + tick_spacing="20.f" + label_spacing="100.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simphysicsfps" + label="Physics FPS" + stat="simphysicsfps" + precision="1" + bar_min="0.f" + bar_max="66.f" + tick_spacing="33.f" + label_spacing="33.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_view + name="physicsdetail" + label="Physics Details" + show_label="true"> + <stat_bar + name="physicspinnedtasks" + label="Pinned Objects" + stat="physicspinnedtasks" + precision="0" + bar_min="0.f" + bar_max="500.f" + tick_spacing="10.f" + label_spacing="40.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="physicslodtasks" + label="Low LOD Objects" + stat="physicslodtasks" + precision="0" + bar_min="0.f" + bar_max="500.f" + tick_spacing="10.f" + label_spacing="40.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="physicsmemoryallocated" + label="Memory Allocated" + stat="physicsmemoryallocated" + unit_label="MB" + precision="0" + bar_min="0.f" + bar_max="1024.f" + tick_spacing="128.f" + label_spacing="256.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + </stat_view> + + <stat_bar + name="simagentups" + label="Agent Updates/Sec" + stat="simagentups" + precision="1" + bar_min="0.f" + bar_max="100.f" + tick_spacing="25.f" + label_spacing="50.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simmainagents" + label="Main Agents" + stat="simmainagents" + precision="0" + bar_min="0.f" + bar_max="80.f" + tick_spacing="10.f" + label_spacing="40.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simchildagents" + label="Child Agents" + stat="simchildagents" + precision="0" + bar_min="0.f" + bar_max="40.f" + tick_spacing="5.f" + label_spacing="10.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simobjects" + label="Objects" + stat="simobjects" + precision="0" + bar_min="0.f" + bar_max="30000.f" + tick_spacing="5000.f" + label_spacing="10000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simactiveobjects" + label="Active Objects" + stat="simactiveobjects" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simactivescripts" + label="Active Scripts" + stat="simactivescripts" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simscripteps" + label="Script Events" + stat="simscripteps" + unit_label="eps" + precision="0" + bar_min="0.f" + bar_max="20000.f" + tick_spacing="2500.f" + label_spacing="5000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="siminpps" + label="Packets In" + stat="siminpps" + unit_label="pps" + precision="0" + bar_min="0.f" + bar_max="2000.f" + tick_spacing="250.f" + label_spacing="1000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simoutpps" + label="Packets Out" + stat="simoutpps" + unit_label="pps" + precision="0" + bar_min="0.f" + bar_max="2000.f" + tick_spacing="250.f" + label_spacing="1000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simpendingdownloads" + label="Pending Downloads" + stat="simpendingdownloads" + precision="0" + bar_min="0.f" + bar_max="800.f" + tick_spacing="100.f" + label_spacing="200.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simpendinguploads" + label="Pending Uploads" + stat="simpendinguploads" + precision="0" + bar_min="0.f" + bar_max="100.f" + tick_spacing="25.f" + label_spacing="50.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simtotalunackedbytes" + label="Total Unacked Bytes" + stat="simtotalunackedbytes" + unit_label="kb" + precision="0" + bar_min="0.f" + bar_max="100000.f" + tick_spacing="25000.f" + label_spacing="50000.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_view + name="simperf" + label="Time (ms)" + show_label="true"> + <stat_bar + name="simframemsec" + label="Total Frame Time" + stat="simframemsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simnetmsec" + label="Net Time" + stat="simnetmsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simsimphysicsmsec" + label="Physics Time" + stat="simsimphysicsmsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simsimothermsec" + label="Simulation Time" + stat="simsimothermsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simagentmsec" + label="Agent Time" + stat="simagentmsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simimagesmsec" + label="Images Time" + stat="simimagesmsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + + <stat_bar + name="simscriptmsec" + label="Script Time" + stat="simscriptmsec" + unit_label="ms" + precision="1" + bar_min="0.f" + bar_max="40.f" + tick_spacing="10.f" + label_spacing="20.f" + show_per_sec="false" + show_bar="false" + show_mean="false" > + </stat_bar> + </stat_view> + </stat_view> + </container_view> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml new file mode 100644 index 0000000000..005952f3f2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + legacy_header_height="18" + bevel_style="in" + left="0" + top="0" + follows="right|bottom" + layout="topleft" + name="sys_well_window" + help_topic="notification_chiclet" + save_rect="true" + title="NOTIFICATIONS" + width="320" + min_width="320" + height="23" + can_minimize="false" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_dock="true" + save_visibility="true" + single_instance="true" +> + <string + name="title_im_well_window"> + CONVERSATIONS + </string> + <string + name="title_notification_well_window"> + NOTIFICATIONS + </string> + + <flat_list_view + color="FloaterDefaultBackgroundColor" + follows="all" + layout="topleft" + name="notification_list" + left="1" + top="20" + height="0" + width="318"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index bcec046456..da412ed8a0 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Explicit left edge to avoid overlapping build tools --> <floater + legacy_header_height="18" height="250" layout="topleft" + left="300" name="telehub" - title="Telehub" - width="272"> + help_topic="telehub" + title="TELEHUB" + width="330"> <text type="string" length="1" @@ -14,7 +18,7 @@ left="10" name="status_text_connected" top="24" - width="200"> + width="315"> Telehub connected to object [OBJECT] </text> <text @@ -26,7 +30,7 @@ left_delta="0" name="status_text_not_connected" top_delta="0" - width="200"> + width="315"> No telehub connected. </text> <text @@ -38,7 +42,7 @@ left_delta="0" name="help_text_connected" top_delta="16" - width="260"> + width="315"> To remove, click Disconnect. </text> <text @@ -50,83 +54,73 @@ left_delta="0" name="help_text_not_connected" top_delta="0" - width="260"> + width="315"> Select object and click Connect Telehub. </text> <button follows="top|left" - font="SansSerifSmall" - height="20" + height="23" label="Connect Telehub" layout="topleft" left_delta="0" name="connect_btn" top_delta="20" - width="110" /> + width="130" /> <button follows="top|left" - font="SansSerifSmall" - height="20" + height="23" label="Disconnect" layout="topleft" left_pad="10" name="disconnect_btn" top_delta="0" - width="110" /> + width="130" /> <text type="string" length="1" follows="left|top" - height="16" + height="14" layout="topleft" left="10" name="spawn_points_text" top="84" - width="200"> + width="315"> Spawn Points (positions, not objects): </text> <scroll_list follows="left|top" - font="SansSerifSmall" height="60" layout="topleft" - left_delta="0" name="spawn_points_list" - top_delta="16" - width="230" /> + width="315" /> <button follows="top|left" - font="SansSerifSmall" - height="20" + height="23" label="Add Spawn" layout="topleft" - left_delta="0" name="add_spawn_point_btn" - top_pad="5" - width="110" /> + width="130" /> <button follows="top|left" - font="SansSerifSmall" - height="20" + height="23" label="Remove Spawn" layout="topleft" left_pad="10" name="remove_spawn_point_btn" - top_delta="0" - width="110" /> + width="130" /> <text type="string" length="1" follows="top|left" - height="80" + height="56" layout="topleft" left="10" name="spawn_point_help" - top="190" - width="260"> - Select object and click Add to specify position. -You may then move or delete the object. + word_wrap="true" + width="317"> + Select object and click "Add Spawn" to specify position. +You can then move or delete the object. Positions are relative to the telehub center. -Select item in list to show position in world. +Select an item in list to highlight it inworld. </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 0681eedbab..bf0a774e76 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="500" layout="topleft" name="floater_test_button" + help_topic="floater_test_button" + translate="false" width="500"> <button - height="20" + height="23" label="Generic Button" layout="topleft" left="10" @@ -15,27 +18,26 @@ width="150" /> <button bottom_delta="30" - height="20" + height="23" label="Bottom delta" layout="topleft" name="bottom_delta_button" /> <button bottom_delta="30" - font="SansSerifSmall" - height="20" + height="23" label="SansSerifSmall" layout="topleft" name="sans_serif_small_button" /> <button auto_resize="true" bottom_delta="30" - height="20" + height="23" label="Auto Resize" layout="topleft" name="auto_resize_button" /> <button bottom_delta="30" - height="20" + height="23" is_toggle="true" label="Click Change Label" label_selected="New Label" @@ -43,69 +45,67 @@ name="label_selected_button" /> <button bottom_delta="30" - height="20" + height="23" label="No Label Shadow" label_shadow="false" layout="topleft" name="label_shadow_button" /> <button bottom_delta="30" - height="20" - label="Red Label" - label_color="red" + height="23" + label="EmphasisColor Label" + label_color="EmphasisColor" layout="topleft" name="label_color_button" /> <button bottom_delta="30" - height="20" + height="23" is_toggle="true" - label="Red Label Selected" - label_color_selected="red" - label_selected="Red Label Selected" + label="Toggle" + label_color_selected="EmphasisColor" + label_selected="Toggle on" layout="topleft" name="label_color_selected_button" /> <button bottom_delta="30" enabled="false" - height="20" - label="Red Label Disabled" - label_color_disabled="red" - label_selected="Red Label Selected" + height="23" + label="Disabled" + label_color_disabled="EmphasisColor" + label_selected="Selected" layout="topleft" name="label_color_disabled_button" /> <button bottom_delta="30" - height="20" - highlight_color="red" - label="Red Highlight" + height="23" + highlight_color="EmphasisColor" + label="Highlight" layout="topleft" name="highlight_color_button" /> <button bottom_delta="30" - height="20" + height="23" hover_glow_amount="0" label="No Hover Glow" layout="topleft" name="hover_glow_amount_button" /> <button - height="30" - image_selected="object_cube_active.tga" - image_unselected="object_cube.tga" + height="16" + image_selected="Move_Run_Off" + image_unselected="Move_Run_Off" layout="topleft" left="200" name="image_button" - picture_style="true" top="20" - width="30" /> + width="16" /> <button - height="30" - image_color="red" - image_selected="object_cube_active.tga" - image_unselected="object_cube.tga" + height="16" + image_color="EmphasisColor" + image_selected="Move_Run_Off" + image_unselected="Move_Run_Off" layout="topleft" left_delta="0" name="image_color_button" - picture_style="true" top_pad="10" - width="30" /> + width="16" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index 5a17ffefac..95aaadfcf3 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="400" layout="topleft" name="floater_test_checkbox" + help_topic="floater_test_checkbox" + translate="false" width="400"> <check_box control_name="ShowStartLocation" - height="16" + height="15" initial_value="true" - label="Show Start Location on Login Screen" + label="Oh look it's a checkbox!" layout="topleft" left="10" name="show_location_checkbox" top="28" width="256" /> <check_box - height="16" + height="15" label="Minimal Checkbox" layout="topleft" left_delta="0" @@ -25,7 +28,7 @@ width="150" /> <check_box enabled="false" - height="16" + height="15" label="Disabled Checkbox" layout="topleft" left_delta="0" @@ -33,26 +36,26 @@ top_pad="14" width="150" /> <check_box - height="16" - label="Text Enabled Red" + height="15" + label="Text Enabled Color" layout="topleft" left_delta="0" name="text_enabled_color_checkbox" - text_enabled_color="red" + label_text.text_color="EmphasisColor" top_pad="14" width="150" /> <check_box enabled="false" - height="16" - label="Text Disabled Red" + height="15" + label="Text Disabled Color" layout="topleft" left_delta="0" name="text_disabled_color_checkbox" - text_disabled_color="red" + label_text.text_readonly_color="EmphasisColor_35" top_pad="14" width="150" /> <check_box - height="16" + height="15" initial_value="true" label="Initial Value Checked" layout="topleft" @@ -62,22 +65,11 @@ width="150" /> <check_box font="Monospace" - height="16" + height="15" label="Font Monospace" layout="topleft" left_delta="0" name="font_checkbox" top_pad="14" width="150" /> - <check_box - height="16" - label="Custom Button" - layout="topleft" - left_delta="0" - name="check_button_checkbox" - top_pad="14" - width="150"> - <check_box.check_button - image_unselected="close_in_blue.tga" /> - </check_box> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 9e1253ec56..45e2e34da7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -1,143 +1,158 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- can_resize="true"
- height="400"
- layout="topleft"
- name="floater_test_combobox"
- width="400">
- <text
- type="string"
- length="1"
- height="16"
- layout="topleft"
- left="10"
- top="24"
- width="200">
- Real world usage (login location):
- </text>
- <combo_box
- allow_text_entry="true"
- control_name="LoginLocation"
- follows="left|bottom"
- height="18"
- layout="topleft"
- left_delta="0"
- max_chars="128"
- name="start_location_combo"
- top_pad="2"
- width="155">
- <combo_box.item
- label="My Last Location"
- value="last" />
- <combo_box.item
- label="My Home"
- value="home" />
- <combo_box.item
- label="<Type region name>"
- value="" />
- </combo_box>
- <text
- type="string"
- length="1"
- height="16"
- layout="topleft"
- left_delta="0"
- top_pad="24"
- width="200">
- Minimal combobox:
- </text>
- <combo_box
- height="18"
- layout="topleft"
- left_delta="0"
- name="minimal_combo"
- top_pad="2"
- width="150">
- <combo_box.item
- label="First Item"
- value="first" />
- <combo_box.item
- label="Second Item"
- value="second" />
- </combo_box>
- <text
- type="string"
- length="1"
- height="16"
- layout="topleft"
- left_delta="0"
- top_pad="24"
- width="200">
- Allow text input:
- </text>
- <combo_box
- allow_text_entry="true"
- height="18"
- layout="topleft"
- left_delta="0"
- name="text_entry_combo"
- top_pad="2"
- width="150">
- <combo_box.item
- label="First Item"
- value="first" />
- <combo_box.item
- label="Second Item"
- value="second" />
- </combo_box>
- <text
- type="string"
- length="1"
- height="16"
- layout="topleft"
- left_delta="0"
- top_pad="24"
- width="200">
- Allow text input, default to second item:
- </text>
- <combo_box
- allow_text_entry="true"
- height="18"
- initial_value="second"
- layout="topleft"
- left_delta="0"
- name="text_entry_combo"
- top_pad="2"
- width="150">
- <combo_box.item
- label="First Item"
- value="first" />
- <combo_box.item
- label="Second Item"
- value="second" />
- </combo_box>
- <text
- type="string"
- length="1"
- height="16"
- layout="topleft"
- left_delta="0"
- top_pad="24"
- width="200">
- Two character max input:
- </text>
- <combo_box
- allow_text_entry="true"
- height="16"
- layout="topleft"
- left_delta="0"
- max_chars="2"
- name="state_combo"
- top_pad="4"
- width="150">
- <combo_box.item
- label="CA"
- value="ca" />
- <combo_box.item
- label="NY"
- value="ny" />
- <combo_box.item
- label="TX"
- value="tx" />
- </combo_box>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="400" + layout="topleft" + name="floater_test_combobox" + help_topic="floater_test_combobox" + translate="false" + width="400"> + <text + type="string" + length="1" + height="16" + layout="topleft" + left="10" + top="24" + width="200"> + Real world usage (login location): + </text> + <combo_box + allow_text_entry="true" + control_name="LoginLocation" + follows="left|bottom" + height="18" + layout="topleft" + left_delta="0" + max_chars="128" + name="start_location_combo" + top_pad="2" + width="155"> + <combo_box.item + label="My Last Location" + name="MyLastLocation" + value="last" /> + <combo_box.item + label="My Home" + name="MyHome" + value="home" /> + <combo_box.item + label="<Type region name>" + name="Typeregionname" + value="" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Minimal combobox: + </text> + <combo_box + height="18" + layout="topleft" + left_delta="0" + name="minimal_combo" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + name="item1" + value="first" /> + <combo_box.item + label="Second Item" + name="item2" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Allow text input: + </text> + <combo_box + allow_text_entry="true" + height="18" + layout="topleft" + left_delta="0" + name="text_entry_combo" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + name="item1" + value="first" /> + <combo_box.item + label="Second Item" + name="item2" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Allow text input, default to second item: + </text> + <combo_box + allow_text_entry="true" + height="18" + initial_value="second" + layout="topleft" + left_delta="0" + name="text_entry_combo2" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + name="item1" + value="first" /> + <combo_box.item + label="Second Item" + name="item2" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Two character max input: + </text> + <combo_box + allow_text_entry="true" + height="16" + layout="topleft" + left_delta="0" + max_chars="2" + name="state_combo" + top_pad="4" + width="150"> + <combo_box.item + label="CA" + name="item1" + value="ca" /> + <combo_box.item + label="NY" + name="item2" + value="ny" /> + <combo_box.item + label="TX" + name="item3" + value="tx" /> + </combo_box> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml new file mode 100644 index 0000000000..209285da2e --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="false" + height="400" + layout="topleft" + name="floater_test_inspectors" + help_topic="floater_test_inspectors" + title="TEST INSPECTORS" + translate="false" + width="400"> + <text + height="20" + left="10" + name="test_inspectors" + top="30" + width="300"> + Click to spawn an inspector: + </text> + <button + name="avatar_2d_btn1" + label="Avatar 2D" + top="50" + left="10" + height="20" + width="100" + commit_callback.function="ShowAvatarInspector" + commit_callback.parameter="22df1dcb-810a-4975-aab9-0159958fe155" /> + <!-- InspectorA Tester --> + <button + name="avatar_2d_btn5" + label="Avatar 2D" + top_pad="10" + left="10" + height="20" + width="100" + commit_callback.function="ShowAvatarInspector" + commit_callback.parameter="927e68e0-e52d-4bb8-b1a9-add97a57c86a" /> + <!-- InspectorB Tester --> + <button + name="avatar_2d_btn2" + label="Avatar 2D" + top_pad="10" + left="10" + height="20" + width="100" + commit_callback.function="ShowAvatarInspector" + commit_callback.parameter="9a2300ca-e251-45dd-bb61-e33139f6e4eb" /> + <!-- InspectorC Tester --> + <button + name="avatar_2d_btn3" + label="Avatar 2D" + top_pad="10" + left="10" + height="20" + width="100" + commit_callback.function="ShowAvatarInspector" + commit_callback.parameter="8024f082-34cc-48a3-a42e-c42f345efd74" /> + <!-- jarvtest Bombastic 2009-10-3 --> + <button + name="avatar_2d_btn4" + label="Avatar 2D" + top_pad="10" + left="10" + height="20" + width="100" + commit_callback.function="ShowAvatarInspector" + commit_callback.parameter="e7dc3c83-1e11-4fa7-beeb-4b18adfb4efa" /> + <button + name="avatar_3d_btn" + label="Avatar 3D" + top="50" + left="150" + height="20" + width="100"/> + <button + name="object_2d_btn" + label="Object 2D" + top_pad="10" + left_delta="0" + height="20" + width="100"/> + <button + name="object_3d_btn" + label="Object 3D" + top_pad="10" + left_delta="0" + height="20" + width="100" + commit_callback.function="ShowObjectInspector" + commit_callback.parameter="" /> + <button + name="group_btn" + label="Group" + top_pad="10" + left_delta="0" + height="20" + width="100" + commit_callback.function="ShowGroupInspector" + commit_callback.parameter="" /> + <button + name="place_btn" + label="Place" + top_pad="10" + left_delta="0" + height="20" + width="100"/> + <button + name="event_btn" + label="Event" + top_pad="10" + left_delta="0" + height="20" + width="100"/> + <text + follows="left|top" + font="SansSerif" + height="20" + left="10" + max_length="65536" + name="slurl" + top_pad="20" + width="150"> + secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect + </text> + <text + follows="left|top" + font="SansSerif" + height="20" + left="10" + max_length="65536" + name="slurl_group" + top_pad="20" + width="150"> + secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect + </text> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index 344ad8447e..94f7e0b798 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="500" layout="topleft" name="floater_test_layout" + help_topic="floater_test_layout" + translate="false" width="500"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml new file mode 100644 index 0000000000..2894ad2a32 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="500" + layout="topleft" + name="floater_test_line_editor" + help_topic="floater_test_line_editor" + translate="false" + width="400"> + <line_editor + height="20" + layout="topleft" + left="10" + name="enabled_line_editor" + top="40" + tool_tip="enabled line editor" + width="200"> + Enabled line editor + </line_editor> + <line_editor + height="20" + layout="topleft" + left_delta="0" + name="ascii_line_editor" + prevalidate_callback="ascii" + tool_tip="ascii line editor" + top_pad="10" + width="200"> + ASCII only line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_line_editor" + top_pad="10" + tool_tip="disabled line editor" + width="200"> + Disabled line editor + </line_editor> + <line_editor + height="20" + layout="topleft" + left_delta="0" + name="enabled_colored_line_editor" + text_color="1 0 0 1" + top_pad="10" + tool_tip="enabled colored line editor" + width="200"> + Enabled red-text line editor + </line_editor> + <line_editor + enabled="false" + height="20" + layout="topleft" + left_delta="0" + name="disabled_colored_line_editor" + text_readonly_color="1 0 0 1" + top_pad="10" + tool_tip="disabled colored line editor" + width="200"> + Disabled red-text line editor + </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_left="25" + top_pad="10" + width="200"> + 25 px left text padding + </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_right="75" + top_pad="10" + width="200"> + 75 px right text padding + </line_editor> + <line_editor + height="20" + left_delta="0" + name="left_pad_editor" + text_pad_left="25" + text_pad_right="75" + top_pad="10" + width="200"> + 25 px left 75 px right text padding + </line_editor> + <!-- "search_editor" is a specialized line_editor that shows read-only + help text until the user clicks in the widget. --> + <search_editor + follows="left|top|right" + height="20" + label="Type here to search" + layout="topleft" + left_delta="0" + name="search editor" + tool_tip="search editor" + top_pad="10" + width="200" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml new file mode 100644 index 0000000000..32ccc31dfd --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="400" + layout="topleft" + name="floater_test_list_view" + help_topic="floater_test_list_view" + translate="false" + width="400"> + <!-- intentionally empty --> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml new file mode 100644 index 0000000000..f4a50ecc96 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="200" + layout="topleft" + name="floater_test_navigation_bar" + help_topic="floater_test_navigation_bar" + translate="false" + width="900"> + <panel + name="navigation_bar" + filename="panel_navigation_bar.xml" + left="10" + right="-10" + top="30" + height="100" + border="true" + /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index ef3e1f598d..db14ecae83 100644 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="400" layout="topleft" name="floater_test_radiogroup" + help_topic="floater_test_radiogroup" + translate="false" width="400"> <radio_group height="54" diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index b1d468e265..20bd555a03 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - height="400" + height="500" layout="topleft" name="floater_test_slider" + help_topic="floater_test_slider" + translate="false" width="450"> <slider height="20" @@ -55,6 +58,13 @@ width="200" /> <slider_bar bottom="320" + height="100" + left="20" + name="slider_bar_vertical" + orientation="vertical" + width="20" /> + <slider_bar + bottom="300" height="20" increment="1" initial_value="2.0" @@ -62,6 +72,7 @@ layout="topleft" max_val="5" min_val="1" + left_pad="20" name="slider_bar" width="300" /> <slider @@ -74,4 +85,17 @@ name="red_slider" text_color="red" text_width="40" /> + <slider + width ="140" + bottom="490" + decimal_digits="1" + height="100" + left="20" + label="Red Slider Vertical" + label_width="100" + layout="topleft" + name="red_slider_vertical" + text_color="red" + orientation="vertical" + text_width="20" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index da88d825e4..acd49aa492 100644 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="400" layout="topleft" name="floater_test_spinner" + help_topic="floater_test_spinner" + translate="false" width="450"> <spinner - height="20" + height="32" label="Generic Spinner" layout="topleft" left="10" + label_width="100" name="generic_spinner" top="40" width="350" /> <spinner height="20" label="Callback Spinner" - label_width="80" + label_width="100" layout="topleft" left_delta="0" name="callback_spinner" diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml new file mode 100644 index 0000000000..548e24efba --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_resize="true" + height="600" + layout="topleft" + name="floater_test_text_editor" + translate="false" + width="800"> + <text_editor + height="50" + follows="top|left|bottom" + left="10" + name="test_text_editor" + tool_tip="text editor" + top="25" + word_wrap="true" + width="200"> + Text Editor + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left="10" + name="test_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> + This contains long text and should scroll horizontally to the right + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left="10" + name="numeric_text_editor" + tool_tip="text editor for numeric text entry only" + top_pad="10" + text_type="int" + width="200"> + This is text that is NOT a number, so shouldn't appear + </text_editor> + +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index b4f3fc1e78..2df9bb35fe 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -1,129 +1,254 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - height="400" + height="600" layout="topleft" name="floater_test_textbox" - width="400"> + help_topic="floater_test_textbox" + translate="false" + width="800"> <text type="string" length="1" - height="10" + height="90" layout="topleft" left="10" - top="30" - width="300"> - Bottom and left specified - </text> - <text - type="string" - length="1" - height="10" - layout="topleft" - left_delta="200" - top_delta="0" - width="300"> - Bottom delta left delta - </text> - <text - type="string" - length="1" - height="10" - layout="topleft" - left="10" - top="50" - width="300"> - Bottom delta -20 - </text> - <text - type="string" - length="1" - height="10" - layout="topleft" - left_delta="0" top_pad="30" width="300"> First line of multiple lines - Second line of multiple lines - </text> - <text - type="string" - length="1" - font="SansSerif" - height="10" - layout="topleft" - left_delta="0" - top_pad="30" - width="300"> - font SansSerif - </text> - <text - type="string" - length="1" - follows="bottom|right" - height="10" - layout="topleft" - left_delta="0" - top_pad="10" - width="300"> - follows bottom right - </text> - <text - type="string" - length="1" - font="SansSerifSmall" - font.style="BOLD" - height="10" - layout="topleft" - left_delta="0" - top_pad="10" - width="300"> - font style BOLD - </text> - <text - type="string" - length="1" - font="SansSerifSmall" - font.style="BOLD|UNDERLINE" - height="10" - layout="topleft" - left_delta="0" - top_pad="10" - width="300"> - font style BOLD UNDERLINE - </text> - <text - type="string" - length="1" - height="10" - layout="topleft" - left_delta="0" - top_pad="10" - width="300"> - font style UNDERLINE - </text> - <text - type="string" - length="1" - height="10" - layout="topleft" - left_delta="0" - top_pad="10" - width="300"> - Escaped greater than > - </text> - <text - type="string" - length="1" - bottom="390" - label="N" - layout="topleft" - left="10" - name="floater_map_north" - right="30" - text="N" - text_color="1 1 1 0.7" - top="370"> - N +Second line of multiple lines +Third line of multiple lines +Fourth line of multiple lines +Fifth line of multiple lines </text> + <text + clip_partial="true" + top_pad="10" + left="10" + width="267" + height="28" + layout="topleft" + follows="right|left" + text_color="white" + use_ellipses="true" + word_wrap="true" + mouse_opaque="false" + name="title" > + This text has word_wrap set true, use_ellipses set true, and clip_partial set true, so it should wrap around, spilling over to the last line, then clip the last partial line and show ellipses to indicate there is more text + </text> + + <text + font="SansSerif" + font.style="BOLD" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + width="300"> + SansSerif BOLD + </text> + <text + font="SansSerif" + font.style="BOLD|UNDERLINE" + height="10" + layout="topleft" + left_delta="0" + top_pad="10" + width="300"> + SansSerif BOLD UNDERLINE + </text> + <text + bottom="390" + left="10" + name="right_aligned_text" + width="300" + halign="right" + top_pad="10"> + Right aligned text + </text> + <text + bottom="390" + left="10" + name="centered_text" + width="300" + halign="center" + top_pad="10"> + Centered text + </text> + <text + left="10" + name="left_aligned_text" + width="300" + halign="left" + top_pad="10"> + Left aligned text + </text> + <text + left="10" + name="v_pad_text" + height="40" + width="300" + halign="left" + top_pad="10" + v_pad="10"> + v_pad = 10, height = 40 + </text> + <text + left="10" + name="v_pad_text" + height="40" + width="300" + halign="left" + top_pad="10" + h_pad="30"> + h_pad = 30, height = 40 + </text> + <text + top_pad="10" + left="10" + right="-10" + height="20" + follows="top|left" + font.name="SansSerifSmall" + name="test_text10" + tool_tip="text"> + SansSerifSmall + The 华文细黑 brown fox ヒラキjumped over the lazy dog. + </text> + <text + top_pad="10" + left="10" + right="-10" + height="25" + follows="top|left" + font.name="SansSerifMedium" + name="test_text11" + tool_tip="text"> + SansSerif + The 华文细黑 brown fox ヒラキjumped over the lazy dog. + </text> + <text + top_pad="10" + left="10" + right="-10" + follows="top|left" + height="26" + font.name="SansSerifLarge" + name="test_text12" + tool_tip="text"> + SansSerifLarge + The 华文细黑 brown fox ヒラキjumped over the lazy dog. + </text> + <text + top_pad="10" + left="10" + height="35" + right="-10" + follows="top|left" + font.name="SansSerifHuge" + name="test_text13" + tool_tip="text"> + SansSerifHuge + The 华文细黑 brown fox ヒラキjumped over the lazy dog. + </text> + +<!-- next column --> + <text_editor + height="50" + follows="top|left|bottom" + left="400" + name="test_text_editor" + tool_tip="text editor" + top="25" + width="200"> + Text Editor + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + left_delta="0" + name="long_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + left_delta="0" + max_length="65536" + name="blob_text_editor" + tool_tip="text editor" + top_pad="10" + width="200" + 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. + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + border_visible="true" + height="50" + follows="top|left|bottom" + font="Monospace" + left_delta="0" + name="monospace_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + <text_editor + height="50" + follows="top|left|bottom" + font="SansSerif" + left_delta="0" + name="sansserif_text_editor" + tool_tip="text editor" + top_pad="10" + width="200"> +Text Editor +with multiple +lines of text +and hence a +scroll bar gjyrrr + </text_editor> + + <text + height="40" + follows="top|left|bottom" + layout="topleft" + name="test_text_box" + tool_tip="text box" + top_pad="5" + width="200"> +Text box +with +multiple lines +and too many lines +to actually fit + </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 9a2602db75..13c850c86c 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- Sample "floater" window with examples of common widgets. +<!-- Sample "floater" window with examples of common widgets. Notes: XML UI (XUI) files use spaces for indentation, not tabs. @@ -15,13 +15,19 @@ Otherwise specify location with left and top attributes. --> <floater + legacy_header_height="18" + can_dock="true" can_resize="true" - title="Test Floater" + title="TEST FLOATER" height="500" + min_width="850" + min_height="500" layout="topleft" name="floater_test_widgets" + help_topic="floater_test_widgets" + translate="false" width="850"> - + <!-- Strings are used by C++ code for localization. They are not visible unless the C++ code uses them to fill in another widget. --> <floater.string @@ -30,25 +36,23 @@ <floater.string name="other_string" value="Other String" /> - + <!-- Floaters can contain drop-down menus. The menu_bar widget contains the inividual menus. The width is automatically computed to fit the labels. --> <menu_bar height="18" layout="topleft" - tool_tip="menu" + follows="top|left" + tool_tip="menu" left="2" name="test_menu_bar" top="16"> <menu - height="16" label="Menu" layout="topleft" tear_off="true" - left="0" name="Menu" - top="-32" width="128"> <!-- menu_item_call will trigger a function call in the C++ code --> <menu_item_call @@ -65,38 +69,39 @@ name="test_menu_item_2" /> </menu> </menu_bar> - + <!-- "text" is one or more read-only lines of text. It can be made clickable but this requires C++ code support. URLs are not automatically underlined. --> <text bottom="55" layout="topleft" - left="10"> - For widget list see https://wiki.lindenlab.com/wiki/Viewer:UI/Widgets + follows="top|left" + left="10" + height="16"> + For widget list see http://wiki.secondlife.com/wiki/XUI_Reference </text> <!-- First column --> - + <button - height="20" + follows="top|left" label="Button" layout="topleft" left_delta="0" name="test_button" - tool_tip="button" + tool_tip="button" top="80" - width="100" /> + width="100" /> <!-- "flyout_button" is a button that can spawn a menu --> <flyout_button - follows="right|bottom" - height="20" + follows="top|left" label="Flyout" layout="topleft" left_delta="0" name="fly_btn" top_pad="15" - tool_tip="flyout button" + tool_tip="flyout button" width="100"> <flyout_button.item label="Item 1" @@ -112,22 +117,30 @@ bottom_delta="35" label="Checkbox" layout="topleft" - tool_tip="checkbox" + tool_tip="checkbox" name="test_checkbox" /> + <check_box + top_pad="5" + enabled="false" + label="Checkbox Disabled" + tool_tip="checkbox disabled" + name="test_checkbox_disabled" /> <!-- "combo_box" is a pop-menu of items. Optionally the box itself can contain a general purpose line input editor, allowing the user to provide input that is not a list item. --> <combo_box bottom_delta="35" - height="16" + follows="top|left" width="150" label="Combobox" layout="topleft" - tool_tip="combo box" + tool_tip="combo box" name="test_combo_box"> <combo_box.item + name="item1" label="Combobox Item 1" /> <combo_box.item + name="item2" label="Combobox Item 2" /> </combo_box> <!-- "icon" is a read-only image. The image_name must match an entry @@ -137,43 +150,45 @@ image_name="icon_avatar_online.tga" layout="topleft" left_delta="0" - tool_tip="icon" + tool_tip="icon" name="test_icon" top_pad="40" width="16" /> - <!-- "line_editor" allows a single line of editable text input. + <!-- "line_editor" allows a single line of editable text input. The contents of this XML node are used as the initial value for the text. --> <line_editor height="20" + follows="top|left" layout="topleft" left_delta="0" name="test_line_editor" top_pad="20" - tool_tip="line editor" + tool_tip="line editor" width="200"> Line Editor Sample Text </line_editor> - <!-- "search_editor" is a specialized line_editor that shows read-only + <!-- "filter_editor" is a specialized line_editor that shows read-only help text until the user clicks in the widget. --> - <search_editor - follows="left|top|right" + <filter_editor + follows="left|top" height="20" label="Type here to search" layout="topleft" left_delta="0" name="search editor" - tool_tip="search editor" + tool_tip="search editor" top_pad="30" width="200" /> <!-- "progress_bar" percent completed gets set in C++ code --> <progress_bar height="16" + follows="top|left" layout="topleft" left_delta="0" name="test_progress_bar" top_pad="30" - tool_tip="progress bar" + tool_tip="progress bar" width="200" /> <!-- "stat_view" is a container for statistics graphs. It is only used for debugging/diagnostic displays. --> @@ -185,10 +200,10 @@ name="axis_view" show_label="true" top_pad="30" - tool_tip="stat view" + tool_tip="stat view" width="200"> <stat_bar - width="100" + width="100" bar_max="100" bottom_delta="30" label="Test Stat" @@ -197,9 +212,9 @@ bar_min="20" name="test_stat_bar" /> </stat_view> - + <!-- New column --> - + <!-- "radio_group" is a set of mutually exclusive choices, like the buttons on a car radio that allow a single radio station to be chosen. --> <radio_group @@ -207,7 +222,7 @@ layout="topleft" left_pad="90" name="size_radio_group" - tool_tip="radio group" + tool_tip="radio group" top="80" width="200"> <radio_item @@ -223,73 +238,112 @@ <!-- "scroll_list" is a scrolling list of columnar data. --> <scroll_list bottom_delta="100" + follows="top|left" height="80" draw_heading="true" - tool_tip="scroll list" + tool_tip="scroll list" layout="topleft"> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="first_column" label="Column A"/> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="second_column" label="Column B"/> + <row> + <column column="first_column">short text</column> + <column column="second_column">more short text</column> + </row> + <row> + <column column="first_column">this is some longer text</column> + <column column="second_column">and here is some more long text</column> + </row> </scroll_list> <!-- "slider" is a horizontal input widget for numerical data. --> <slider bottom_delta="45" + follows="top|left" layout="topleft" min_val="0" max_val="100" initial_value="20" label="Slider" name="test_slider" - tool_tip="slider" + tool_tip="slider" width="200" /> <!-- "spinner" is a numerical input widget with an up and down arrow to change the value. --> <spinner bottom_delta="35" + follows="top|left" label="Spinner" layout="topleft" - name="test_spinner" + label_width="45" + name="test_spinner" tool_tip="spinner"/> <text bottom_delta="50" + follows="top|left" + font.name="SansSerifSmall" font.style = "UNDERLINE" layout="topleft" name="test_text" tool_tip="text"> Text (underlined) </text> - <!-- "text_editor" is a multi-line text input widget, similar to + <text + top_pad="10" + follows="top|left" + layout="topleft" + width="60" + use_ellipses="true" + name="test_text" + tool_tip="text"> + Truncated text here + </text> + <!-- "text_editor" is a multi-line text input widget, similar to textarea in HTML. --> <text_editor - height="80" + height="40" + follows="top|left|bottom" layout="topleft" left_delta="0" name="test_text_editor" - tool_tip="text editor" + tool_tip="text editor" top_pad="25" width="200"> Text Editor </text_editor> - + <text + height="40" + follows="top|left|bottom" + layout="topleft" + name="test_text_box" + tool_tip="text box" + top_pad="5" + width="200"> + Text box +with +multiple lines +and too +many +line to actually fit + </text> <!-- And a third column --> - + <!-- "tab_container" is a holder for multiple panels of UI widgets. Tabs can appear at the top, bottom, or left of the container. --> <tab_container follows="all" height="400" layout="topleft" - left="575" + left="525" name="group_tab_container" tab_position="top" - tool_tip="tab container" + tool_tip="tab container" top="80" - width="250"> + width="300"> <!-- "panel" is a container for widgets. It is automatically resized to fit the parent tab_container. --> <panel @@ -300,12 +354,10 @@ <!-- "color_swatch" displays a color and spawns a color picker when clicked. --> <color_swatch - border_color="1 0 0 1" can_apply_immediately="true" color="0.3 0.6 0.9 1" follows="left|top" height="90" - border="true" layout="topleft" left="10" label="Color Swatch 1" @@ -314,7 +366,6 @@ top="10" width="80" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="1 0 1 1" follows="left|top" @@ -326,10 +377,60 @@ tool_tip="Color Swatch: Click to open Color Picker" top_delta="0" width="80" /> + <text + top_pad="10" + left="10" + width="250" + follows="top|left" + font.name="Monospace" + name="test_text10" + tool_tip="text"> + Monospace Button Flyout Checkbox + </text> + <text + top_pad="10" + left="10" + width="250" + follows="top|left" + font.name="SansSerifSmall" + name="test_text10" + tool_tip="text"> + SansSerifSmall. Русский 中文 (简体) + </text> + <text + top_pad="10" + left="10" + width="250" + follows="top|left" + font.name="SansSerif" + name="test_text11" + tool_tip="text"> + SansSerif. Русский 中文 (简体) + </text> + <text + top_pad="10" + left="10" + width="250" + follows="top|left" + font.name="SansSerifLarge" + name="test_text12" + tool_tip="text"> + SansSerifLarge. Русский 中文 (简体) + </text> + <text + top_pad="10" + left="10" + width="250" + follows="top|left" + font.name="SansSerifHuge" + name="test_text13" + tool_tip="text"> + SansSerifHuge. Русский 中文 (简体) + </text> </panel> <!-- panels can also refer to other floaters or panels --> <panel - border="true" + border="true" filename="floater_test_checkbox.xml" height="225" label="Tab 2 - Checkbox" diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index 8d85519610..cad7d72ed7 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" can_resize="true" height="290" @@ -7,7 +8,8 @@ min_height="290" min_width="410" name="texture picker" - title="Pick: Texture" + help_topic="texture_picker" + title="PICK: TEXTURE" width="410"> <floater.string name="choose_picture"> @@ -21,14 +23,16 @@ type="string" length="1" follows="left|top" + text_color="White" + font="SansSerifBig" halign="center" - height="14" + height="17" layout="topleft" left="4" name="Multiple" top="96" width="163"> - Multiple + Multiple textures </text> <text type="string" @@ -40,12 +44,11 @@ name="unknown" top_pad="80" width="163"> - Dimensions: [DIMENSIONS] + Size: [DIMENSIONS] </text> <button enabled="false" follows="left|bottom" - font="SansSerifSmall" height="20" label="Default" label_selected="Default" @@ -53,11 +56,10 @@ left_delta="0" name="Default" top_pad="4" - width="64" /> + width="80" /> <button enabled="false" follows="left|bottom" - font="SansSerifSmall" height="20" label="None" label_selected="None" @@ -65,85 +67,84 @@ left_pad="4" name="None" top_delta="0" - width="64" /> + width="80" /> <button follows="left|bottom" - font="SansSerifSmall" height="20" label="Blank" label_selected="Blank" layout="topleft" left="4" name="Blank" - top="232" - width="64" /> - <check_box - height="24" + top_pad="5" + width="80" /> + <button + follows="left|bottom" + height="28" + image_selected="eye_button_active.tga" + image_unselected="eye_button_inactive.tga" + layout="topleft" + left_pad="50" + top_delta="3" + name="Pipette" + width="28" /> + <check_box + follows="left|bottom" + height="20" initial_value="true" - label="Show Folders" + label="Apply now" layout="topleft" - left="175" - name="show_folders_check" - top="20" - width="201" /> - <search_editor + left="4" + name="apply_immediate_check" + top="262" + width="120" /> + <filter_editor follows="left|top|right" - height="16" - label="Type here to search" + height="23" + label="Filter Textures" layout="topleft" - left_delta="0" + left="175" name="inventory search editor" - top_delta="0" + top="20" width="231" /> <inventory_panel allow_multi_select="false" - border="true" - follows="left|top|right|bottom" - height="216" + bg_visible="true" + bg_alpha_color="DkGray2" + border="false" + follows="all" + height="200" layout="topleft" left_delta="0" name="inventory panel" top_pad="4" width="231" /> - <check_box - follows="left|bottom" - height="20" - initial_value="true" - label="Apply Immediately" - layout="topleft" - left="4" - name="apply_immediate_check" - top="262" - width="150" /> - <button - follows="left|bottom" - height="32" - image_selected="eye_button_active.tga" - image_unselected="eye_button_inactive.tga" + <check_box + height="14" + initial_value="false" + label="Show folders" layout="topleft" - left="139" - name="Pipette" - picture_style="true" - top="250" - width="32" /> - <button + name="show_folders_check" + top_pad="0" + left_delta="-3" + width="200" /> + <button follows="right|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="OK" + label_selected="OK" layout="topleft" - left="186" - name="Cancel" - top="262" + right="-120" + name="Select" width="100" /> <button follows="right|bottom" height="20" - label="Select" - label_selected="Select" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_pad="4" - name="Select" - top_delta="0" + right="-10" + left_pad="5" + name="Cancel" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 17b73b47ab..cea2ba2c7f 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1,14 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - follows="left|top" - height="550" + legacy_header_height="18" + follows="left|top|right" + height="580" layout="topleft" + bg_opaque_image="Window_NoTitle_Foreground" + bg_alpha_image="Window_NoTitle_Background" name="toolbox floater" + help_topic="toolbox_floater" save_rect="true" - short_title="Build" + short_title="BUILD TOOLS" single_instance="true" + save_visibility="true" sound_flags="0" - width="272"> + width="295"> <floater.string name="status_rotate"> Drag colored bands to rotate object @@ -27,11 +32,11 @@ </floater.string> <floater.string name="status_camera"> - Click and drag to change view + Click and drag to move camera </floater.string> <floater.string name="status_grab"> - Drag to move, Ctrl to lift, Ctrl-Shift to rotate + Drag to move, Ctrl to lift, Ctrl+Shift to rotate </floater.string> <floater.string name="status_place"> @@ -63,497 +68,485 @@ </floater.string> <button follows="left|top" - height="32" - image_disabled="tool_zoom.tga" - image_disabled_selected="tool_zoom_active.tga" - image_selected="tool_zoom_active.tga" - image_unselected="tool_zoom.tga" + height="25" + image_bottom_pad="1" + image_overlay="Tool_Zoom" + image_selected="PushButton_Selected_Press" layout="topleft" - left="4" + left="10" name="button focus" - picture_style="true" tool_tip="Focus" - top="2" - width="32" /> + width="35"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Focus" /> + </button> <button follows="left|top" - height="32" - image_disabled="tool_grab.tga" - image_disabled_selected="tool_grab_active.tga" - image_selected="tool_grab_active.tga" - image_unselected="tool_grab.tga" + height="25" + image_bottom_pad="1" + image_overlay="Tool_Grab" + image_selected="PushButton_Selected_Press" layout="topleft" - left_pad="4" + left_pad="10" name="button move" - picture_style="true" tool_tip="Move" - top_delta="0" - width="32" /> + width="35"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Move" /> + </button> <button follows="left|top" - height="32" - image_disabled="tool_face.tga" - image_disabled_selected="tool_face_active.tga" - image_selected="tool_face_active.tga" - image_unselected="tool_face.tga" + height="25" + image_bottom_pad="1" + image_overlay="Tool_Face" + image_selected="PushButton_Selected_Press" layout="topleft" - left_pad="4" + left_pad="10" name="button edit" - picture_style="true" tool_tip="Edit" - top_delta="0" - width="32" /> + width="35"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Edit" /> + </button> <button follows="left|top" - height="32" - image_disabled="tool_create.tga" - image_disabled_selected="tool_create_active.tga" - image_selected="tool_create_active.tga" - image_unselected="tool_create.tga" + height="25" + image_bottom_pad="1" + image_overlay="Tool_Create" + image_selected="PushButton_Selected_Press" layout="topleft" - left_pad="4" + left_pad="10" name="button create" - picture_style="true" tool_tip="Create" - top_delta="0" - width="32" /> + width="35"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Create" /> + </button> <button follows="left|top" - height="32" - image_disabled="tool_dozer.tga" - image_disabled_selected="tool_dozer_active.tga" - image_selected="tool_dozer_active.tga" - image_unselected="tool_dozer.tga" + height="25" + image_bottom_pad="1" + image_overlay="Tool_Dozer" + image_selected="PushButton_Selected_Press" layout="topleft" - left_pad="4" + left_pad="10" name="button land" - picture_style="true" tool_tip="Land" - top_delta="0" - width="32" /> - <slider_bar + width="35"> + <button.commit_callback + function="BuildTool.setTool" + parameter="Land" /> + </button> + <text + height="30" + word_wrap="true" + use_ellipses="true" + type="string" + text_color="LabelSelectedDisabledColor" + length="1" follows="left|top" - height="14" - increment="0.01" - initial_value="0.125" layout="topleft" - left="114" - max_val="0.5" - name="slider zoom" - top="55" - width="134" /> - <radio_group - draw_border="false" - height="45" + left="8" + name="text status" + top_pad="3" + width="285"> + Drag to move, shift-drag to copy + </text> + <radio_group layout="topleft" - left_delta="-110" - name="focus_radio_group" - top_delta="0" - width="114"> + left="10" + height="70" + top="54" + name="focus_radio_group"> <radio_item - height="16" + top_pad="6" label="Zoom" layout="topleft" - left="0" - name="radio zoom" - top="-1" - width="114" /> + name="radio zoom" /> <radio_item - height="16" + top_pad="6" label="Orbit (Ctrl)" layout="topleft" - left_delta="0" - name="radio orbit" - top_delta="15" - width="114" /> + name="radio orbit" /> <radio_item - height="16" - label="Pan (Ctrl-Shift)" + top_pad="6" + label="Pan (Ctrl+Shift)" layout="topleft" - left_delta="0" - name="radio pan" - top_delta="15" - width="114" /> + name="radio pan" /> + <radio_group.commit_callback + function="BuildTool.commitRadioFocus"/> </radio_group> - <radio_group - draw_border="false" - height="45" + <slider_bar + follows="left|top" + height="14" + increment="0.01" + initial_value="0.125" layout="topleft" - left_delta="0" - name="move_radio_group" - top_delta="0" - width="114"> + max_val="0.5" + top_delta="-2" + left_delta="100" + name="slider zoom" + width="134"> + <slider_bar.commit_callback + function="BuildTool.commitZoom"/> + </slider_bar> + <radio_group + left="10" + height="70" + top="54" + layout="topleft" + name="move_radio_group"> <radio_item - height="16" + top_pad="6" label="Move" layout="topleft" - left="0" - name="radio move" - top="-1" - width="114" /> + name="radio move" /> <radio_item - height="16" + top_pad="6" label="Lift (Ctrl)" layout="topleft" - left_delta="0" - name="radio lift" - top_delta="15" - width="114" /> + name="radio lift" /> <radio_item - height="16" - label="Spin (Ctrl-Shift)" + top_pad="6" + label="Spin (Ctrl+Shift)" layout="topleft" - left_delta="0" - name="radio spin" - top_delta="15" - width="114" /> - </radio_group> - <radio_group - draw_border="false" - height="60" + name="radio spin" /> + <radio_group.commit_callback + function="BuildTool.commitRadioMove"/> + </radio_group> + <radio_group + follows="left|top" + left="5" + top="59" + height="70" layout="topleft" - left_delta="0" - name="edit_radio_group" - top_delta="0" - width="114"> + name="edit_radio_group"> <radio_item - height="16" - label="Position" - layout="topleft" - left="0" - name="radio position" - top="-1" - width="114" /> + label="Move" + layout="topleft" + name="radio position" /> <radio_item - height="16" + top_pad="6" label="Rotate (Ctrl)" layout="topleft" - left_delta="0" - name="radio rotate" - top_delta="15" - width="114" /> + name="radio rotate" /> <radio_item - height="16" - label="Stretch (Ctrl-Shift)" + top_pad="6" + label="Stretch (Ctrl+Shift)" layout="topleft" - left_delta="0" - name="radio stretch" - top_delta="15" - width="123" /> + name="radio stretch" /> <radio_item - height="16" - label="Select Texture" + top_pad="6" + label="Select Face" layout="topleft" - left_delta="0" - name="radio select face" - top_delta="15" - width="114" /> + name="radio select face" /> + <radio_group.commit_callback + function="BuildTool.commitRadioEdit"/> </radio_group> <check_box - control_name="EditLinkedParts" - height="16" - label="Edit linked parts" - layout="topleft" - left_delta="0" - name="checkbox edit linked parts" - top_pad="3" - width="114" /> - <text - type="string" - length="1" + left="10" follows="left|top" - height="14" - layout="topleft" - left_delta="2" - name="text ruler mode" - top_pad="6" - width="68"> - Ruler: - </text> - <combo_box - height="20" - layout="topleft" - left_delta="40" - name="combobox grid mode" - top_delta="-2" - width="86"> - <combo_box.item - label="World" - value="World" /> - <combo_box.item - label="Local" - value="Local" /> - <combo_box.item - label="Reference" - value="Reference" /> - </combo_box> - <check_box + height="28" + control_name="EditLinkedParts" + label="Edit linked" + layout="topleft" + name="checkbox edit linked parts" + top_pad="2"> + <check_box.commit_callback + function="BuildTool.selectComponent"/> + </check_box> + + <text + text_color="LtGray_50" + follows="top|left" + halign="left" + left="13" + name="RenderingCost" + tool_tip="Shows the rendering cost calculated for this object" + top_pad="0" + type="string" + width="100"> + þ: [COUNT] + </text> + <check_box control_name="ScaleUniform" - height="16" - label="Stretch Both Sides" + height="19" + label="" layout="topleft" left="143" name="checkbox uniform" - top="54" - width="134" /> + top="50" + width="20" /> + <text + height="19" + label="Stretch Both Sides" + left="163" + name="checkbox uniform label" + top="55" + width="120" + wrap="true"> + Stretch Both Sides + </text> <check_box control_name="ScaleStretchTextures" - height="16" + height="19" initial_value="true" label="Stretch Textures" layout="topleft" - left_delta="0" + left="143" name="checkbox stretch textures" - top_pad="1" + top_pad="7" width="134" /> - <check_box + <check_box control_name="SnapEnabled" - height="16" + height="18" initial_value="true" - label="Use Grid" + label="Snap to grid" layout="topleft" - left_delta="0" + top_pad="0" name="checkbox snap to grid" - top_pad="1" width="134" /> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Options..." - label_selected="Options..." + <combo_box + height="23" layout="topleft" - left_delta="20" - name="Options..." - top="103" - valign="center" - width="80" /> - <text - type="string" - length="1" follows="left|top" - height="16" - layout="topleft" - left="4" - name="text status" - top="36" - width="264"> - Drag to move, shift-drag to copy - </text> + name="combobox grid mode" + tool_tip="Choose the type of grid ruler for positioning the object" + top_pad="0" + width="108"> + <combo_box.item + label="World grid" + name="World" + value="World" /> + <combo_box.item + label="Local grid" + name="Local" + value="Local" /> + <combo_box.item + label="Reference grid" + name="Reference" + value="Reference" /> + <combo_box.commit_callback + function="BuildTool.gridMode"/> + </combo_box> <button + left_pad="0" + image_selected="ForwardArrow_Press" + image_unselected="ForwardArrow_Off" + layout="topleft" + name="Options..." + tool_tip="See more grid options" + top_delta="0" + right="-10" + width="18" + height="23" > + <button.commit_callback + function="BuildTool.gridOptions"/> + </button> + <button follows="left|top" - height="24" - image_disabled="object_cube.tga" - image_disabled_selected="object_cube_active.tga" - image_selected="object_cube_active.tga" - image_unselected="object_cube.tga" + height="20" + image_disabled="Object_Cube" + image_disabled_selected="Object_Cube" + image_selected="Object_Cube_Selected" + image_unselected="Object_Cube" layout="topleft" - left_delta="0" + left="10" name="ToolCube" - picture_style="true" tool_tip="Cube" - top_delta="15" - width="24" /> + top="51" + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_prism.tga" - image_disabled_selected="object_prism_active.tga" - image_selected="object_prism_active.tga" - image_unselected="object_prism.tga" + height="20" + image_disabled="Object_Prism" + image_disabled_selected="Object_Prism" + image_selected="Object_Prism_Selected" + image_unselected="Object_Prism" layout="topleft" - left_delta="23" + left_delta="29" name="ToolPrism" - picture_style="true" tool_tip="Prism" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_pyramid.tga" - image_disabled_selected="object_pyramid_active.tga" - image_selected="object_pyramid_active.tga" - image_unselected="object_pyramid.tga" + height="20" + image_disabled="Object_Pyramid" + image_disabled_selected="Object_Pyramid" + image_selected="Object_Pyramid_Selected" + image_unselected="Object_Pyramid" layout="topleft" - left_delta="23" + left_delta="29" name="ToolPyramid" - picture_style="true" tool_tip="Pyramid" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_tetrahedron.tga" - image_disabled_selected="object_tetrahedron_active.tga" - image_selected="object_tetrahedron_active.tga" - image_unselected="object_tetrahedron.tga" + height="20" + image_disabled="Object_Tetrahedron" + image_disabled_selected="Object_Tetrahedron" + image_selected="Object_Tetrahedron_Selected" + image_unselected="Object_Tetrahedron" layout="topleft" - left_delta="23" + left_delta="29" name="ToolTetrahedron" - picture_style="true" tool_tip="Tetrahedron" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_cylinder.tga" - image_disabled_selected="object_cylinder_active.tga" - image_selected="object_cylinder_active.tga" - image_unselected="object_cylinder.tga" + height="20" + image_disabled="Object_Cylinder" + image_disabled_selected="Object_Cylinder" + image_selected="Object_Cylinder_Selected" + image_unselected="Object_Cylinder" layout="topleft" - left_delta="23" + left_delta="29" name="ToolCylinder" - picture_style="true" tool_tip="Cylinder" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_hemi_cylinder.tga" - image_disabled_selected="object_hemi_cylinder_active.tga" - image_selected="object_hemi_cylinder_active.tga" - image_unselected="object_hemi_cylinder.tga" + height="20" + image_disabled="Object_Hemi_Cylinder" + image_disabled_selected="Object_Hemi_Cylinder" + image_selected="Object_Hemi_Cylinder_Selected" + image_unselected="Object_Hemi_Cylinder" layout="topleft" - left_delta="23" + left_delta="29" name="ToolHemiCylinder" - picture_style="true" tool_tip="Hemicylinder" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_cone.tga" - image_disabled_selected="object_cone_active.tga" - image_selected="object_cone_active.tga" - image_unselected="object_cone.tga" + height="20" + image_disabled="Object_Cone" + image_disabled_selected="Object_Cone" + image_selected="Object_Cone_Selected" + image_unselected="Object_Cone" layout="topleft" - left_delta="23" + left_delta="29" name="ToolCone" - picture_style="true" tool_tip="Cone" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_hemi_cone.tga" - image_disabled_selected="object_hemi_cone_active.tga" - image_selected="object_hemi_cone_active.tga" - image_unselected="object_hemi_cone.tga" + height="20" + image_disabled="Object_Hemi_Cone" + image_disabled_selected="Object_Hemi_Cone" + image_selected="Object_Hemi_Cone_Selected" + image_unselected="Object_Hemi_Cone" layout="topleft" - left_delta="23" + left_delta="29" name="ToolHemiCone" - picture_style="true" tool_tip="Hemicone" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_sphere.tga" - image_disabled_selected="object_sphere_active.tga" - image_selected="object_sphere_active.tga" - image_unselected="object_sphere.tga" + height="20" + image_disabled="Object_Sphere" + image_disabled_selected="Object_Sphere" + image_selected="Object_Sphere_Selected" + image_unselected="Object_Sphere" layout="topleft" - left_delta="23" + left_delta="29" name="ToolSphere" - picture_style="true" tool_tip="Sphere" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_hemi_sphere.tga" - image_disabled_selected="object_hemi_sphere_active.tga" - image_selected="object_hemi_sphere_active.tga" - image_unselected="object_hemi_sphere.tga" + height="20" + image_disabled="Object_Hemi_Sphere" + image_disabled_selected="Object_Hemi_Sphere" + image_selected="Object_Hemi_Sphere_Selected" + image_unselected="Object_Hemi_Sphere" layout="topleft" - left_delta="23" + left_delta="29" name="ToolHemiSphere" - picture_style="true" tool_tip="Hemisphere" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_torus.tga" - image_disabled_selected="object_torus_active.tga" - image_selected="object_torus_active.tga" - image_unselected="object_torus.tga" + height="20" + image_disabled="Object_Torus" + image_disabled_selected="Object_Torus" + image_selected="Object_Torus_Selected" + image_unselected="Object_Torus" layout="topleft" - left="4" + left="10" name="ToolTorus" - picture_style="true" tool_tip="Torus" - top="74" - width="24" /> + top="77" + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_tube.tga" - image_disabled_selected="object_tube_active.tga" - image_selected="object_tube_active.tga" - image_unselected="object_tube.tga" + height="20" + image_disabled="Object_Tube" + image_disabled_selected="Object_Tube" + image_selected="Object_Tube_Selected" + image_unselected="Object_Tube" layout="topleft" - left_delta="23" + left_delta="29" name="ToolTube" - picture_style="true" tool_tip="Tube" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_ring.tga" - image_disabled_selected="object_ring_active.tga" - image_selected="object_ring_active.tga" - image_unselected="object_ring.tga" + height="20" + image_disabled="Object_Ring" + image_disabled_selected="Object_Ring" + image_selected="Object_Ring_Selected" + image_unselected="Object_Ring" layout="topleft" - left_delta="23" + left_delta="29" name="ToolRing" - picture_style="true" tool_tip="Ring" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_tree.tga" - image_disabled_selected="object_tree_active.tga" - image_selected="object_tree_active.tga" - image_unselected="object_tree.tga" + height="20" + image_disabled="Object_Tree" + image_disabled_selected="Object_Tree" + image_selected="Object_Tree_Selected" + image_unselected="Object_Tree" layout="topleft" - left_delta="23" + left_delta="29" name="ToolTree" - picture_style="true" tool_tip="Tree" top_delta="0" - width="24" /> + width="20" /> <button follows="left|top" - height="24" - image_disabled="object_grass.tga" - image_disabled_selected="object_grass_active.tga" - image_selected="object_grass_active.tga" - image_unselected="object_grass.tga" + height="20" + image_disabled="Object_Grass" + image_disabled_selected="Object_Grass" + image_selected="Object_Grass_Selected" + image_unselected="Object_Grass" + image_overlay_color="Red" layout="topleft" - left_delta="23" + left_delta="29" name="ToolGrass" - picture_style="true" tool_tip="Grass" top_delta="0" - width="24" /> + width="20" /> <check_box control_name="CreateToolKeepSelected" - height="16" - label="Keep selected" + height="19" + label="Keep Tool selected" layout="topleft" left="4" name="checkbox sticky" @@ -561,8 +554,8 @@ width="128" /> <check_box control_name="CreateToolCopySelection" - height="16" - label="Copy selected" + height="19" + label="Copy selection" layout="topleft" left_delta="0" name="checkbox copy selection" @@ -570,9 +563,9 @@ width="134" /> <check_box control_name="CreateToolCopyCenters" - height="16" + height="19" initial_value="true" - label="Center" + label="Center Copy" layout="topleft" left_delta="18" name="checkbox copy centers" @@ -580,15 +573,14 @@ width="134" /> <check_box control_name="CreateToolCopyRotates" - height="16" - label="Rotate" + height="19" + label="Rotate Copy" layout="topleft" left_delta="0" name="checkbox copy rotates" top_delta="16" width="134" /> <radio_group - draw_border="false" height="105" layout="topleft" left="4" @@ -596,15 +588,15 @@ top="54" width="114"> <radio_item - height="16" + height="19" label="Select Land" layout="topleft" left="0" name="radio select land" - top="-1" - width="114" /> + top="-106" + width="134" /> <radio_item - height="16" + height="19" label="Flatten" layout="topleft" left_delta="0" @@ -612,7 +604,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Raise" layout="topleft" left_delta="0" @@ -620,7 +612,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Lower" layout="topleft" left_delta="0" @@ -628,7 +620,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Smooth" layout="topleft" left_delta="0" @@ -636,7 +628,7 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Roughen" layout="topleft" left_delta="0" @@ -644,35 +636,25 @@ top_delta="15" width="114" /> <radio_item - height="16" + height="19" label="Revert" layout="topleft" left_delta="0" name="radio revert" top_delta="15" width="114" /> + <radio_group.commit_callback + function="BuildTool.commitRadioLand"/> </radio_group> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Apply" - label_selected="Apply" - layout="topleft" - left_delta="112" - name="button apply to selection" - tool_tip="Modify Selected Land" - top_delta="-2" - width="78" /> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="2" + left="135" name="Bulldozer:" - top_pad="4" + top="57" width="100"> Bulldozer: </text> @@ -682,22 +664,23 @@ follows="left|top" height="12" layout="topleft" - left="132" name="Dozer Size:" - top="94" - width="100"> + left="135" + top_pad="5" + width="50"> Size </text> <slider_bar + control_name ="LandBrushSize" follows="left|top" - height="16" + height="19" initial_value="2.0" layout="topleft" - left_delta="46" max_val="11" min_val="1" + left_pad="0" name="slider brush size" - top_delta="0" + top_delta="-3" width="80" /> <text type="string" @@ -705,110 +688,127 @@ follows="left|top" height="12" layout="topleft" - left="132" name="Strength:" - top="116" - width="100"> + left="135" + top_pad="5" + width="50"> Strength </text> <slider_bar follows="left|top" - height="16" + height="19" + left_pad="0" initial_value="0.00" layout="topleft" - left_delta="46" max_val="2" min_val="-1" name="slider force" - top_delta="0" - width="80" /> + top_delta="-3" + width="80" > + <slider_bar.commit_callback + function="BuildTool.LandBrushForce"/> + </slider_bar> + <button + follows="left|top" + height="23" + label="Apply" + label_selected="Apply" + top_pad="5" + layout="topleft" + left="135" + name="button apply to selection" + tool_tip="Modify selected land" + width="82"> + <button.commit_callback + function="BuildTool.applyToSelection"/> + </button> <text + text_color="LtGray_50" type="string" length="1" + height="10" follows="left|top" halign="right" - height="16" layout="topleft" - left="118" + right="-10" name="obj_count" - top="135" + top_pad="7" width="143"> - Selected objects: [COUNT] + Objects: [COUNT] </text> <text + text_color="LtGray_50" type="string" length="1" follows="left|top" halign="right" - height="16" layout="topleft" - left_delta="0" + right="-10" name="prim_count" - top_delta="12" width="143"> - primitives: [COUNT] + Prims: [COUNT] </text> <tab_container follows="left|top" - height="384" - layout="topleft" + height="410" + halign="center" left="0" name="Object Info Tabs" - tab_max_width="52" + tab_max_width="100" tab_min_width="40" tab_position="top" - top="166" - width="272"> - <panel - border="true" - follows="left|top|right|bottom" - height="367" - label="General" - layout="topleft" - left="1" - mouse_opaque="false" - name="General" - top="16" - width="270"> - <panel.string - name="text deed continued"> - Deed... - </panel.string> - <panel.string - name="text deed"> - Deed - </panel.string> + tab_height="25" + top="173" + width="295"> + <panel + border="false" + follows="all" + label="General" + layout="topleft" + mouse_opaque="false" + help_topic="toolbox_general_tab" + name="General" + top="16" + width="295"> +<panel.string + name="text deed continued"> + Deed + </panel.string> + <panel.string + name="text deed"> + Deed + </panel.string> <panel.string name="text modify info 1"> - You can modify this object. + You can modify this object </panel.string> <panel.string name="text modify info 2"> - You can modify these objects. + You can modify these objects </panel.string> <panel.string name="text modify info 3"> - You cannot modify this object. + You can't modify this object </panel.string> <panel.string name="text modify info 4"> - You cannot modify these objects. + You can't modify these objects </panel.string> <panel.string name="text modify warning"> - Must select entire object to set permissions. + You must select entire object to set permissions </panel.string> <panel.string name="Cost Default"> - Price: L$ + Price: L$ </panel.string> <panel.string name="Cost Total"> - Total Price: L$ + Total Price: L$ </panel.string> <panel.string name="Cost Per Unit"> - Price Per: L$ + Price Per: L$ </panel.string> <panel.string name="Cost Mixed"> @@ -819,529 +819,455 @@ Mixed Sale </panel.string> <text - type="string" - length="1" follows="left|top" height="10" - layout="topleft" left="10" name="Name:" - top="10" - width="78"> + top="5" + width="90"> Name: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top|right" - height="16" - layout="topleft" - left_delta="78" + height="19" + left_pad="0" max_length="63" name="Object Name" select_on_focus="true" top_delta="0" - width="172" /> + width="170" /> <text - type="string" - length="1" follows="left|top" height="10" - layout="topleft" left="10" name="Description:" - top="30" - width="78"> + top_pad="3" + width="90"> Description: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top|right" - height="16" - layout="topleft" - left_delta="78" + height="19" + left_pad="0" max_length="127" name="Object Description" select_on_focus="true" top_delta="0" - width="172" /> + width="170" /> <text type="string" + left="10" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left="10" name="Creator:" - top="50" - width="78"> + width="90"> Creator: </text> <text type="string" length="1" follows="left|top" - height="16" + left_pad="0" + height="19" layout="topleft" - left_delta="78" name="Creator Name" - top_delta="0" - width="88"> - Thrax Linden + width="175"> + Esbee Linden </text> - <button - follows="top|right" - font="SansSerifSmall" - height="20" - label="Profile..." - label_selected="Profile..." - layout="topleft" - left_pad="6" - name="button creator profile" - top_delta="-4" - width="78" /> <text type="string" length="1" + left="10" follows="left|top" - height="16" + height="19" layout="topleft" - left="10" name="Owner:" - top="70" - width="78"> + width="90"> Owner: </text> <text type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left_delta="78" name="Owner Name" - top_delta="0" - width="88"> - Thrax Linden + left_pad="0" + width="175"> + Erica Linden </text> - <button - follows="top|right" - font="SansSerifSmall" - height="20" - label="Profile..." - label_selected="Profile..." - layout="topleft" - left_pad="6" - name="button owner profile" - top_delta="-4" - width="78" /> - <text + <text type="string" length="1" follows="left|top" - height="16" layout="topleft" left="10" + height="18" name="Group:" - top="90" - width="78"> + top_pad="4" + width="75"> Group: </text> <name_box follows="left|top" - height="16" - initial_value="(retrieving)" + height="18" + initial_value="Loading..." layout="topleft" - left_delta="78" + left_pad="23" name="Group Name Proxy" - top_delta="0" - width="88" /> + width="142" /> <button - follows="top|right" - font="SansSerifSmall" - height="20" - label="Set..." - label_selected="Set..." + follows="top|left" + height="23" + image_overlay="Edit_Wrench" + layout="topleft" + left_pad="3" + name="button set group" + tab_stop="false" + tool_tip="Choose a group to share this object's permissions" + width="23" /> + <check_box + height="19" + follows="left|top" + label="Share" layout="topleft" - left_pad="6" - name="button set group" - top_delta="-4" - width="78" /> + name="checkbox share with group" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + top_pad="10" + left="106" + width="87" /> + <button + follows="top|left" + height="23" + label="Deed" + label_selected="Deed" + layout="topleft" + name="button deed" + left_pad="3" + tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." + width="80" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" + top_pad="10" left="10" - name="Permissions:" - top="110" - width="85"> - Permissions: + name="label click action" + width="98"> + Click to: </text> + <combo_box + follows="left|top" + height="23" + layout="topleft" + name="clickaction" + width="168" + left_pad="0"> + <combo_box.item + label="Touch (default)" + name="Touch/grab(default)" + value="Touch" /> + <combo_box.item + label="Sit on object" + name="Sitonobject" + value="Sit" /> + <combo_box.item + label="Buy object" + name="Buyobject" + value="Buy" /> + <combo_box.item + label="Pay object" + name="Payobject" + value="Pay" /> + <combo_box.item + label="Open" + name="Open" + value="Open" /> + <combo_box.item + label="Zoom" + name="Zoom" + value="Zoom" /> + </combo_box> + <check_box + height="23" + label="For Sale:" + layout="topleft" + name="checkbox for sale" + left="7" + width="100" /> +<!-- NEW SALE TYPE COMBO BOX --> + <combo_box + left_pad="0" + layout="topleft" + follows="left|top" + allow_text_entry="false" + height="23" + initial_value="2" + max_chars="20" + mouse_opaque="true" + name="sale type" + width="168"> + <combo_box.item + name="Copy" + label="Copy" + value="2" /> + <combo_box.item + name="Contents" + label="Contents" + value="3" /> + <combo_box.item + name="Original" + label="Original" + value="1" /> + </combo_box> +<!-- NEW PRICE SPINNER +Objects are allowed to be for sale for L$0 to invoke buy UI behavior +even though the user gets a free copy. +--> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + top_pad="8" + left="108" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="65" + width="165" + min_val="0" + height="20" + max_val="999999999" /> + <check_box + height="15" + width="110" + top_pad="5" + label="Show in search" + layout="topleft" + left="100" + name="search_check" + tool_tip="Let people see this object in search results" /> + <panel + border="false" + follows="left|top" + layout="topleft" + mouse_opaque="false" + background_visible="true" + bg_alpha_color="DkGray" + name="perms_build" + left="0" + top="241" + height="130" + width="290"> <text type="string" length="1" - follows="left|top|right" + left="10" + top_pad="9" + text_color="EmphasisColor" height="16" + follows="left|top|right" layout="topleft" - left_delta="0" name="perm_modify" - top_pad="4" - width="250"> - You can modify this object. + width="264"> + You can modify this object + </text> + <text + type="string" + follows="left|top" + name="Anyone can:" + width="250" + left="10"> + Anyone: </text> <check_box - height="16" - label="Share with group" - layout="topleft" - left_delta="0" - name="checkbox share with group" - tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions." - top_pad="4" - width="166" /> - <button - follows="top|right" - font="SansSerifSmall" - height="20" - label="Deed..." - label_selected="Deed..." - layout="topleft" - left_delta="172" - name="button deed" - tool_tip="Group shared objects can be deeded by a group officer." - top="166" - width="78" /> - <check_box - height="16" - label="Allow anyone to move" + height="19" + label="Move" layout="topleft" - left="10" name="checkbox allow everyone move" - top="190" - width="142" /> + left="10" + width="85" /> <check_box - height="16" - label="Allow anyone to copy" + height="19" + label="Copy" layout="topleft" - left_delta="0" + left_pad="0" name="checkbox allow everyone copy" - top_pad="4" - width="141" /> - <check_box - height="16" - label="Show in search" - layout="topleft" - left_delta="0" - name="search_check" - tool_tip="Let people see this object in search results" - top_pad="4" - width="78" /> - <check_box - height="16" - label="For Sale" - layout="topleft" - left_delta="0" - name="checkbox for sale" - top_pad="4" - width="78" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left_pad="12" - name="Cost" - top_delta="0" - width="78"> - Price: L$ - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="2" - max_length="25" - name="Edit Cost" - top_delta="0" - width="75" /> - <radio_group - draw_border="false" - follows="left|top|right" - height="16" - layout="topleft" - left="42" - name="sale type" - top="270" - width="218"> - <radio_item - height="16" - label="Original" - layout="topleft" - left="0" - name="Original" - top="0" - width="70" /> - <radio_item - height="16" - label="Copy" - layout="topleft" - left_delta="70" - name="Copy" - top_delta="0" - width="70" /> - <radio_item - height="16" - label="Contents" - layout="topleft" - left_delta="70" - name="Contents" - top_delta="0" - width="76" /> - </radio_group> + width="90" /> <text - type="string" - length="1" - follows="left|top|right" - height="10" - layout="topleft" - left="10" - name="Next owner can:" - top="288" - width="250"> - Next owner can: + type="string" + follows="left|top" + height="19" + name="Next owner can:" + width="250" + left="10"> + Next owner: </text> <check_box follows="left|top|right" - height="16" label="Modify" layout="topleft" - left_delta="0" + left="10" name="checkbox next owner can modify" - top_pad="6" - width="250" /> + width="85" /> <check_box follows="left|top|right" - height="16" + height="19" label="Copy" layout="topleft" - left_delta="60" + left_pad="0" name="checkbox next owner can copy" - top_delta="0" - width="190" /> + width="80" /> <check_box follows="left|top|right" - height="16" - label="Resell/Give away" + height="19" + label="Transfer" layout="topleft" - left_delta="60" name="checkbox next owner can transfer" + left_pad="0" top_delta="0" - width="130" /> + tool_tip="Next owner can give away or resell this object" + width="100" /> <text type="string" + text_color="EmphasisColor" length="1" + top_pad="5" follows="left|top" - height="10" layout="topleft" left="10" - name="label click action" - top="322" - width="150"> - When Left-Clicked: - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - name="clickaction" - top_pad="7" - width="150"> - <combo_box.item - label="Touch/grab (default)" - value="Touch/grab (default)" /> - <combo_box.item - label="Sit on object" - value="Sit on object" /> - <combo_box.item - label="Buy object" - value="Buy object" /> - <combo_box.item - label="Pay object" - value="Pay object" /> - <combo_box.item - label="Open" - value="Open" /> - <combo_box.item - label="Play parcel media" - value="Play" /> - <combo_box.item - label="Open parcel media" - value="Open Media" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="88" name="B:" - top="105" - width="174"> + height="10" + width="80"> B: </text> <text type="string" + text_color="White" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="O:" - top_delta="0" - width="124"> - O; + height="10" + width="80"> + O: </text> <text type="string" + text_color="EmphasisColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="G:" - top_delta="0" - width="74"> + height="10" + width="80"> G: </text> <text type="string" + text_color="White" length="1" follows="left|top" - height="10" + left="10" + top_pad="2" layout="topleft" - left="88" name="E:" - top="117" - width="174"> + height="10" + width="80"> E: </text> <text type="string" + text_color="EmphasisColor" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="N:" - top_delta="0" - width="124"> + height="10" + width="80"> N: </text> <text type="string" + text_color="White" length="1" follows="left|top" - height="10" layout="topleft" - left_delta="50" + left_pad="0" name="F:" - top_delta="0" - width="74"> + height="10" + width="80"> F: </text> </panel> - <panel - border="true" - follows="left|top|right|bottom" + </panel> + <panel + border="false" + follows="all" height="367" label="Object" layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_object_tab" name="Object" - top_delta="0" - width="270"> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="select_single" - top="10" - width="252"> - Select only one primitive to edit parameters. - </text> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="edit_object" - top_delta="0" - width="252"> - Edit object parameters: - </text> + top="16" + width="295"> <check_box - height="16" + height="19" label="Locked" layout="topleft" - left_delta="-2" name="checkbox locked" tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits." - top_pad="10" + top_pad="5" + left="10" width="123" /> <check_box - height="16" + height="19" label="Physical" layout="topleft" - left_delta="0" name="Physical Checkbox Ctrl" tool_tip="Allows object to be pushed and affected by gravity" - top_pad="2" + top_pad="0" width="123" /> <check_box - height="16" + height="19" label="Temporary" layout="topleft" - left_delta="0" name="Temporary Checkbox Ctrl" - tool_tip="Causes object to be deleted 1 minute after creation." - top_pad="2" + tool_tip="Causes object to be deleted 1 minute after creation" + top_pad="0" width="123" /> <check_box - height="16" + height="19" label="Phantom" layout="topleft" - left_delta="0" name="Phantom Checkbox Ctrl" tool_tip="Causes object to not collide with other objects or avatars" - top_pad="2" + top_pad="0" width="123" /> + <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="2" name="label position" - top_pad="4" + top_pad="10" width="121"> Position (meters) </text> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="X" @@ -1351,12 +1277,12 @@ max_val="512" min_val="-256" name="Pos X" - text_enabled_color="0.43 0.06 0.06 1" - top_pad="4" + text_enabled_color="1 0 0.3 .7" + top_pad="5" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Y" @@ -1366,12 +1292,12 @@ max_val="512" min_val="-256" name="Pos Y" - text_enabled_color="0 0.39 0.15 1" - top_pad="2" + text_enabled_color="EmphasisColor" + top_pad="3" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Z" @@ -1380,8 +1306,8 @@ left_delta="0" max_val="4096" name="Pos Z" - text_enabled_color="0 0.26 0.51 1" - top_pad="2" + text_enabled_color="0 0.8 1 .65" + top_pad="3" width="87" /> <text type="string" @@ -1397,7 +1323,7 @@ </text> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="X" @@ -1408,11 +1334,11 @@ min_val="0.01" name="Scale X" text_enabled_color="1 1 1 1" - top_pad="4" + top_pad="5" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Y" @@ -1423,11 +1349,11 @@ min_val="0.01" name="Scale Y" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Z" @@ -1438,7 +1364,7 @@ min_val="0.01" name="Scale Z" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <text type="string" @@ -1448,14 +1374,14 @@ layout="topleft" left_delta="0" name="label rotation" - top_pad="6" + top_pad="10" width="121"> Rotation (degrees) </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="X" @@ -1466,12 +1392,12 @@ min_val="-9999" name="Rot X" text_enabled_color="1 1 1 1" - top_pad="6" + top_pad="5" width="87" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="Y" @@ -1482,12 +1408,12 @@ min_val="-9999" name="Rot Y" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" label="Z" @@ -1498,93 +1424,96 @@ min_val="-9999" name="Rot Z" text_enabled_color="1 1 1 1" - top_pad="2" + top_pad="3" width="87" /> - <text + + <!-- <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="0" - name="label material" - top_pad="6" - width="121"> - Material - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - name="material" - top_pad="4" - width="87"> - <combo_box.item - label="Stone" - value="Stone" /> - <combo_box.item - label="Metal" - value="Metal" /> - <combo_box.item - label="Glass" - value="Glass" /> - <combo_box.item - label="Wood" - value="Wood" /> - <combo_box.item - label="Flesh" - value="Flesh" /> - <combo_box.item - label="Plastic" - value="Plastic" /> - <combo_box.item - label="Rubber" - value="Rubber" /> - </combo_box> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="121" + left="125" name="label basetype" - top="26" - width="141"> - Building Block Type - </text> + top="5" + width="150"> + Prim Type + </text>--> <combo_box - height="18" + height="19" layout="topleft" - left_delta="0" name="comboBaseType" - top_pad="6" - width="141"> + top="6" + left="125" + width="150"> <combo_box.item label="Box" + name="Box" value="Box" /> <combo_box.item label="Cylinder" + name="Cylinder" value="Cylinder" /> <combo_box.item label="Prism" + name="Prism" value="Prism" /> <combo_box.item label="Sphere" + name="Sphere" value="Sphere" /> <combo_box.item label="Torus" + name="Torus" value="Torus" /> <combo_box.item label="Tube" + name="Tube" value="Tube" /> <combo_box.item label="Ring" + name="Ring" value="Ring" /> <combo_box.item label="Sculpted" + name="Sculpted" value="Sculpted" /> </combo_box> + <combo_box + height="19" + layout="topleft" + name="material" + top_pad="5" + width="150"> + <combo_box.item + label="Stone" + name="Stone" + value="Stone" /> + <combo_box.item + label="Metal" + name="Metal" + value="Metal" /> + <combo_box.item + label="Glass" + name="Glass" + value="Glass" /> + <combo_box.item + label="Wood" + name="Wood" + value="Wood" /> + <combo_box.item + label="Flesh" + name="Flesh" + value="Flesh" /> + <combo_box.item + label="Plastic" + name="Plastic" + value="Plastic" /> + <combo_box.item + label="Rubber" + name="Rubber" + value="Rubber" /> + </combo_box> <text type="string" length="1" @@ -1593,9 +1522,9 @@ layout="topleft" left_delta="0" name="text cut" - top_pad="2" - width="141"> - Path Cut Begin and End + top_pad="5" + width="150"> + Path Cut (begin/end) </text> <spinner follows="left|top" @@ -1608,7 +1537,7 @@ left_delta="0" max_val="0.98" name="cut begin" - top_pad="6" + top_pad="4" width="68" /> <spinner follows="left|top" @@ -1618,7 +1547,7 @@ label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="0.02" name="cut end" top_delta="0" @@ -1629,9 +1558,9 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text hollow" - top="98" + top_pad="6" width="68"> Hollow </text> @@ -1643,30 +1572,29 @@ layout="topleft" left_pad="10" name="text skew" - top_delta="0" width="63"> Skew </text> <spinner decimal_digits="1" follows="left|top" - height="16" + height="19" increment="5" initial_value="0" layout="topleft" - left="121" + left="125" max_val="95" name="Scale 1" - top="112" + top_pad="4" width="68" /> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" layout="topleft" - left_pad="5" + left_pad="10" max_val="0.95" min_val="-0.95" name="Skew" @@ -1676,32 +1604,36 @@ type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" - left="121" + left="125" name="Hollow Shape" - top="133" - width="141"> + top_pad="4" + width="150"> Hollow Shape </text> <combo_box - height="18" + height="23" layout="topleft" left_delta="0" name="hole" - top_pad="6" - width="141"> + top_pad="-2" + width="150"> <combo_box.item label="Default" + name="Default" value="Default" /> <combo_box.item label="Circle" + name="Circle" value="Circle" /> <combo_box.item label="Square" + name="Square" value="Square" /> <combo_box.item label="Triangle" + name="Triangle" value="Triangle" /> </combo_box> <text @@ -1712,14 +1644,14 @@ layout="topleft" left_delta="0" name="text twist" - top_pad="2" - width="141"> - Twist Begin and End + top_pad="5" + width="150"> + Twist (begin/end) </text> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="9" initial_value="0" label="B" @@ -1729,18 +1661,18 @@ max_val="180" min_val="-180" name="Twist Begin" - top_pad="6" + top_pad="4" width="68" /> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="9" initial_value="0" label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" max_val="180" min_val="-180" name="Twist End" @@ -1752,13 +1684,14 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="scale_taper" - top="205" - width="141"> + top_pad="3" + width="150"> Taper </text> <text + visible="false" type="string" length="1" follows="left|top" @@ -1767,13 +1700,13 @@ left_delta="0" name="scale_hole" top_delta="0" - width="141"> + width="150"> Hole Size </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1787,13 +1720,13 @@ <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="-1" name="Taper Scale Y" top_delta="0" @@ -1804,16 +1737,16 @@ follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text topshear" - top="239" + top_pad="3" width="141"> Top Shear </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1828,31 +1761,33 @@ <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" max_val="0.5" min_val="-0.5" name="Shear Y" top_delta="0" width="68" /> <text + visible="false" type="string" length="1" follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="advanced_cut" - top="273" - width="141"> - Profile Cut Begin and End + top_pad="3" + width="150"> + Profile Cut (begin/end) </text> <text + visible="false" type="string" length="1" follows="left|top" @@ -1861,8 +1796,8 @@ left_delta="0" name="advanced_dimple" top_delta="0" - width="141"> - Dimple Begin and End + width="150"> + Dimple (begin/end) </text> <text type="string" @@ -1873,12 +1808,12 @@ left_delta="0" name="advanced_slice" top_delta="0" - width="141"> - Slice Begin and End + width="150"> + Slice (begin/end) </text> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="0" label="B" @@ -1891,33 +1826,35 @@ width="68" /> <spinner follows="left|top" - height="16" + height="19" increment="0.025" initial_value="1" label="E" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="0.05" name="Path Limit End" top_delta="0" width="68" /> <text + visible="false" type="string" length="1" follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text taper2" - top="306" - width="141"> + top_pad="3" + width="150"> Taper </text> <spinner + visible="false" decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="X" @@ -1929,61 +1866,65 @@ top_pad="3" width="68" /> <spinner + visible="false" decimal_digits="2" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" label="Y" label_width="10" layout="topleft" - left_pad="5" + left_pad="10" min_val="-1" name="Taper Y" top_delta="0" width="68" /> <text + visible="false" type="string" length="1" follows="left|top" height="10" layout="topleft" - left="121" + left="125" name="text radius delta" - top="337" + top_pad="2" width="78"> Radius </text> <text + visible="false" type="string" length="1" follows="left|top" height="10" layout="topleft" - left_delta="73" + left_delta="78" name="text revolutions" - top_delta="0" width="68"> Revolutions </text> <spinner + visible="false" follows="left|top" - height="16" + height="19" increment="0.05" initial_value="0" layout="topleft" - left="121" + left="125" min_val="-1" name="Radius Offset" - top="350" + top_pad="4" width="68" /> <spinner + visible="false" decimal_digits="2" follows="left|top" - height="16" + height="19" initial_value="1" layout="topleft" - left_pad="5" + left_pad="10" max_val="4" min_val="1" name="Revolutions" @@ -1996,29 +1937,29 @@ height="141" label="Sculpt Texture" layout="topleft" - left="121" + left="125" name="sculpt texture control" tool_tip="Click to choose a picture" top="70" visible="false" - width="141" /> + width="145" /> <check_box - height="16" + height="19" label="Mirror" layout="topleft" left_delta="0" name="sculpt mirror control" - tool_tip="Flips sculpted prim along the X axis." + tool_tip="Flips sculpted prim along the X axis" top_pad="8" visible="false" - width="121" /> + width="130" /> <check_box - height="16" + height="19" label="Inside-out" layout="topleft" left_delta="0" name="sculpt invert control" - tool_tip="Inverts the sculpted prims normals, making it appear inside-out." + tool_tip="Inverts the sculpted prims normals, making it appear inside-out" top_pad="4" visible="false" width="121" /> @@ -2032,55 +1973,62 @@ name="label sculpt type" top_pad="10" visible="false" - width="121"> + width="130"> Stitching type </text> <combo_box - height="18" + height="19" layout="topleft" left_delta="0" name="sculpt type control" - top_pad="6" + top_pad="4" visible="false" - width="141"> + width="150"> <combo_box.item - label="none)" + label="(none)" + name="None" value="None" /> <combo_box.item label="Sphere" + name="Sphere" value="Sphere" /> <combo_box.item label="Torus" + name="Torus" value="Torus" /> <combo_box.item label="Plane" + name="Plane" value="Plane" /> <combo_box.item label="Cylinder" + name="Cylinder" value="Cylinder" /> </combo_box> </panel> <panel - border="true" - follows="left|top|right|bottom" + border="false" + follows="all" height="367" label="Features" layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_features_tab" name="Features" top_delta="0" - width="270"> + width="295"> <text type="string" length="1" follows="left|top" - height="10" + height="20" layout="topleft" left="10" name="select_single" - top="10" - width="252"> + top="5" + width="252" + word_wrap="true"> Select only one primitive to edit features. </text> <text @@ -2089,41 +2037,41 @@ follows="left|top" height="10" layout="topleft" - left_delta="0" + left="10" name="edit_object" - top_delta="0" + top="5" width="252"> Edit object features: </text> <check_box - height="16" + height="19" label="Flexible Path" layout="topleft" - left_delta="0" + left="10" name="Flexible1D Checkbox Ctrl" - tool_tip="Allows object to flex about the Z axis. (Client-side only)" - top_pad="10" + tool_tip="Allows object to flex about the Z axis (Client-side only)" + top_pad="20" width="121" /> <spinner follows="left|top" - height="16" + height="19" increment="1" initial_value="2" label="Softness" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="3" name="FlexNumSections" - top_pad="4" + top_pad="10" width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="0.3" label="Gravity" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2133,11 +2081,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="2" label="Drag" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2146,11 +2094,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="0" label="Wind" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2159,11 +2107,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.5" initial_value="1" label="Tension" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2172,11 +2120,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force X" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2186,11 +2134,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force Y" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2200,11 +2148,11 @@ width="128" /> <spinner follows="left|top" - height="16" + height="19" increment="0.01" initial_value="0" label="Force Z" - label_width="65" + label_width="70" layout="topleft" left_delta="0" max_val="10" @@ -2216,83 +2164,125 @@ height="16" label="Light" layout="topleft" - left_delta="0" + left="10" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light" - top_pad="14" - width="121" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left_delta="0" - name="label color" - top_pad="11" - width="58"> - Color - </text> + top_pad="15" + width="60" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.5 0.5 0.5 1" + border.border_thickness="0" follows="left|top" - height="48" + height="50" layout="topleft" - left_delta="67" + left_pad="10" + top_pad="-17" name="colorswatch" - tool_tip="Click to open Color Picker" - top="237" - width="32" /> - <spinner - follows="left|top" - height="16" + tool_tip="Click to open color picker" + width="40" /> + <texture_picker + allow_no_texture="true" + top_delta="0" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="48" + label="" + left_delta="57" + mouse_opaque="true" + name="light texture control" + tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)" + width="32" /> + <spinner + follows="left|top" + height="19" initial_value="0.5" label="Intensity" - label_width="65" + label_width="70" layout="topleft" left="10" name="Light Intensity" - top="273" - width="128" /> - <spinner - follows="left|top" - height="16" - initial_value="5" - label="Radius" - label_width="65" - layout="topleft" - left_delta="0" - max_val="20" - name="Light Radius" - top_pad="4" - width="128" /> - <spinner - follows="left|top" - height="16" - increment="0.25" - initial_value="1" - label="Falloff" - label_width="65" - layout="topleft" - left_delta="0" - max_val="2" - name="Light Falloff" - top_pad="4" + top_pad="3" width="128" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.1" + initial_value="0.5" + label="FOV" + label_width="55" + left="144" + max_val="3" + min_val="0" + mouse_opaque="true" + name="Light FOV" + width="120" /> + <spinner follows="left|top" + height="19" + initial_value="5" + label="Radius" + label_width="70" + layout="topleft" + left="10" + max_val="20" + name="Light Radius" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.5" + initial_value="0.5" + label="Focus" + label_width="55" + left="144" + max_val="20" + min_val="-20" + mouse_opaque="true" + name="Light Focus" + width="120" /> + <spinner follows="left|top" + height="19" + increment="0.25" + initial_value="1" + label="Falloff" + label_width="70" + layout="topleft" + left="10" + max_val="2" + name="Light Falloff" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" + decimal_digits="3" + follows="left|top" + height="16" + increment="0.05" + initial_value="1" + label="Ambiance" + label_width="55" + left="144" + max_val="1" + min_val="0" + mouse_opaque="true" + name="Light Ambiance" + width="120" /> </panel> - <panel - border="true" - follows="left|top|right|bottom" + <panel + border="false" + follows="all" height="367" label="Texture" layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_texture_tab" name="Texture" top_delta="0" - width="270"> + width="295"> <panel.string name="string repeats per meter"> Repeats Per Meter @@ -2304,6 +2294,7 @@ <texture_picker can_apply_immediately="true" default_image_name="Default" + fallback_image="locked_image.j2c" follows="left|top" height="80" label="Texture" @@ -2311,18 +2302,17 @@ left="10" name="texture control" tool_tip="Click to choose a picture" - top="10" + top="8" width="64" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" follows="left|top" height="80" label="Color" layout="topleft" - left_pad="26" + left_pad="15" name="colorswatch" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top_delta="0" width="64" /> <text @@ -2331,16 +2321,17 @@ follows="left|top" height="10" layout="topleft" - left="180" + left_pad="15" name="color trans" - top="1" - width="80"> + text_readonly_color="LabelDisabledColor" + top="6" + width="110"> Transparency % </text> <spinner decimal_digits="0" follows="left|top" - height="16" + height="19" increment="2" initial_value="0" layout="topleft" @@ -2357,14 +2348,15 @@ layout="topleft" left_delta="0" name="glow label" - top_pad="2" + text_readonly_color="LabelDisabledColor" + top_pad="8" width="80"> Glow </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" initial_value="0" layout="topleft" left_delta="0" @@ -2372,12 +2364,12 @@ top_pad="4" width="80" /> <check_box - height="16" + height="19" label="Full Bright" layout="topleft" - left_delta="0" + left_delta="-5" name="checkbox fullbright" - top_pad="7" + top_pad="4" width="81" /> <text type="string" @@ -2387,22 +2379,25 @@ layout="topleft" left="10" name="tex gen" - top="94" + text_readonly_color="LabelDisabledColor" + top_pad="5" width="90"> Mapping </text> <combo_box - height="18" + height="23" layout="topleft" left_delta="0" name="combobox texgen" top_pad="4" - width="80"> + width="90"> <combo_box.item label="Default" + name="Default" value="Default" /> <combo_box.item label="Planar" + name="Planar" value="Planar" /> </combo_box> <text @@ -2411,30 +2406,35 @@ follows="left|top" height="10" layout="topleft" - left="100" name="label shininess" - top="94" - width="70"> + left_pad="4" + text_readonly_color="LabelDisabledColor" + top_pad="-37" + width="90"> Shininess </text> <combo_box - height="18" + height="23" layout="topleft" left_delta="0" name="combobox shininess" top_pad="4" - width="70"> + width="90"> <combo_box.item label="None" + name="None" value="None" /> <combo_box.item label="Low" + name="Low" value="Low" /> <combo_box.item label="Medium" + name="Medium" value="Medium" /> <combo_box.item label="High" + name="High" value="High" /> </combo_box> <text @@ -2443,74 +2443,138 @@ follows="left|top" height="10" layout="topleft" - left="180" + left_pad="4" name="label bumpiness" - top="94" - width="80"> + text_readonly_color="LabelDisabledColor" + top_pad="-37" + width="90"> Bumpiness </text> <combo_box - height="18" + height="23" layout="topleft" left_delta="0" name="combobox bumpiness" top_pad="4" - width="80"> + width="90"> <combo_box.item label="None" + name="None" value="None" /> <combo_box.item label="Brightness" + name="Brightness" value="Brightness" /> <combo_box.item label="Darkness" + name="Darkness" value="Darkness" /> <combo_box.item label="woodgrain" + name="woodgrain" value="woodgrain" /> <combo_box.item label="bark" + name="bark" value="bark" /> <combo_box.item label="bricks" + name="bricks" value="bricks" /> <combo_box.item label="checker" + name="checker" value="checker" /> <combo_box.item label="concrete" + name="concrete" value="concrete" /> <combo_box.item label="crustytile" + name="crustytile" value="crustytile" /> <combo_box.item label="cutstone" + name="cutstone" value="cutstone" /> <combo_box.item label="discs" + name="discs" value="discs" /> <combo_box.item label="gravel" + name="gravel" value="gravel" /> <combo_box.item label="petridish" + name="petridish" value="petridish" /> <combo_box.item label="siding" + name="siding" value="siding" /> <combo_box.item label="stonetile" + name="stonetile" value="stonetile" /> <combo_box.item label="stucco" + name="stucco" value="stucco" /> <combo_box.item label="suction" + name="suction" value="suction" /> <combo_box.item label="weave" + name="weave" value="weave" /> </combo_box> + <!-- + <line_editor + bevel_style="in" + border_style="line" + border_thickness="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + max_length="63" + name="Home Url" + select_on_focus="true" + top="134" + width="250" /> + <check_box + height="16" + label="Media Face" + layout="topleft" + left_delta="0" + name="has media" + top_pad="6" + width="70" /> + <button + follows="left|top" + font="SansSerifSmall" + height="20" + label="Set Media Info" + label_selected="Set Media Info" + layout="topleft" + left_pad="60" + name="media info set" + top_delta="-4" + width="120" /> +--> + <check_box + follows="top|left" + height="16" + initial_value="false" + label="Align planar faces" + layout="topleft" + left="17" + name="checkbox planar align" + tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." + top_delta="26" + width="140" /> <text type="string" length="1" @@ -2518,110 +2582,87 @@ height="10" layout="topleft" left="10" - name="tex scale" - top="148" - width="160"> - Repeats per Face + name="rpt" + text_readonly_color="LabelDisabledColor" + top_pad="2" + width="140"> + Repeats / Face </text> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Horizontal (U)" - label_width="90" + label_width="125" layout="topleft" left="20" max_val="100" name="TexScaleU" - top="162" - width="160" /> + top_pad="5" + width="185" /> <check_box - height="16" + height="19" label="Flip" layout="topleft" - left_pad="10" + left_pad="5" name="checkbox flip s" - top_delta="1" + top_delta="0" width="70" /> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Vertical (V)" - label_width="90" + label_width="125" layout="topleft" left="20" max_val="100" name="TexScaleV" - top="180" - width="160" /> + width="185" /> <check_box - height="16" + height="19" label="Flip" layout="topleft" - left_pad="10" + left_pad="5" name="checkbox flip t" - top_delta="1" + top_delta="0" width="70" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="tex rotate" - top="218" - width="102"> - Rotation (degrees) - </text> <spinner decimal_digits="2" follows="left|top" - height="16" + height="19" increment="1" initial_value="0" + label="Rotation˚" layout="topleft" - left_delta="102" + label_width="135" + left="10" max_val="9999" min_val="-9999" name="TexRot" - top_delta="0" - width="68" /> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="10" - name="rpt" - top="240" - width="160"> - Repeats Per Meter - </text> + width="195" /> + <spinner decimal_digits="1" follows="left|top" - height="16" + height="23" initial_value="1" + label="Repeats / Meter" layout="topleft" - left_delta="102" + label_width="135" + left="10" max_val="10" min_val="0.1" name="rptctrl" - top_delta="0" - width="68" /> + width="195" /> <button follows="left|top" - font="SansSerifSmall" - height="20" + height="23" label="Apply" label_selected="Apply" layout="topleft" - left_pad="10" + left_pad="5" name="button apply" - top_delta="-4" width="75" /> <text type="string" @@ -2631,236 +2672,307 @@ layout="topleft" left="10" name="tex offset" - top="278" - width="160"> - Offset + text_readonly_color="LabelDisabledColor" + width="200"> + Texture Offset </text> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Horizontal (U)" - label_width="90" + label_width="125" layout="topleft" left="20" min_val="-1" name="TexOffsetU" - top="292" - width="160" /> + width="185" /> <spinner follows="left|top" - height="16" + height="19" initial_value="0" label="Vertical (V)" - label_width="90" + label_width="125" layout="topleft" left_delta="0" min_val="-1" name="TexOffsetV" - top_pad="2" - width="160" /> + top_pad="1" + width="185" /> + <panel + border="false" + follows="left|top" + layout="topleft" + mouse_opaque="false" + background_visible="true" + bg_alpha_color="DkGray" + name="Add_Media" + left="0" + height="47" + width="290"> <text type="string" length="1" follows="left|top" - height="20" + height="18" layout="topleft" left="10" - name="textbox autofix" - top="332" - width="160"> - Align media texture -(must load first) - </text> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - label="Align" - label_selected="Align" - layout="topleft" - left="112" - name="button align" - top="340" - width="68" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="367" + top_pad="3" + name="media_tex" + width="190"> + Media + </text> + <button + follows="top|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="0" + name="add_media" + tab_stop="false" + top_delta="0" + tool_tip="Add Media" + width="18"> + <button.commit_callback + function="BuildTool.AddMedia"/> + </button> + <button + follows="top|left" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + left_pad="5" + name="delete_media" + tool_tip="Delete this media texture" + top_delta="0" + width="18"> + <button.commit_callback + function="BuildTool.DeleteMedia"/> + </button> + <button + follows="top|left" + tool_tip="Edit this Media" + height="12" + image_disabled="Icon_Gear_Background" + image_selected="Icon_Gear_Press" + image_unselected="Icon_Gear_Foreground" + layout="topleft" + left_pad="10" + name="edit_media" + top_delta="3" + width="12"> + <button.commit_callback + function="BuildTool.EditMedia"/> + </button> + <text + follows="left|top|right" + height="9" + layout="topleft" + left="10" + use_ellipses="true" + read_only="true" + name="media_info" + width="280" /> + <web_browser + visible="false" + enabled="false" + border_visible="true" + bottom_delta="0" + follows="top|left" + left="0" + name="title_media" + width="4" + height="4" + start_url="about:blank" + decouple_texture_size="true" /> + <button + follows="right|top" + height="22" + label="Align" + label_selected="Align Media" + layout="topleft" + right="-16" + name="button align" + top_delta="-4" + tool_tip="Align media texture (must load first)" + width="80" /> + </panel> + </panel> + <panel + border="false" + follows="all" label="Content" layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="toolbox_contents_tab" name="Contents" top_delta="0" - width="270"> + width="295"> <button follows="left|top" - height="20" + height="23" label="New Script" - label_selected="New Script..." + label_selected="New Script" layout="topleft" left="10" name="button new script" top="10" - width="100" /> + width="134" /> <button follows="left|top" - height="20" - label="Permissions..." + height="23" + label="Permissions" layout="topleft" - left_pad="10" + left_pad="8" name="button permissions" - top_delta="0" - width="100" /> - <panel_inventory - follows="left|top" + width="134" /> + <panel_inventory_object + border="true" + border_visible="true" + bevel_style="in" + follows="left|top|right" height="325" layout="topleft" left="10" name="contents_inventory" - top="35" - width="252" /> - </panel> - </tab_container> - <panel - follows="left|top" + top="50" + width="275" /> + </panel> + </tab_container> + <panel + follows="left|top" height="384" layout="topleft" left_delta="0" name="land info panel" top_delta="0" - width="272"> - <text + width="295"> + <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_info" top="24" - width="150"> + width="240"> Parcel Information </text> <text type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" - left="48" + left="30" name="label_area_price" top="48" width="150"> - Price: L$[PRICE] for [AREA] sq. m. + Price: L$[PRICE] for [AREA] m² </text> <text type="string" length="1" follows="left|top" - height="16" + height="19" layout="topleft" left_delta="0" name="label_area" top_delta="0" width="150"> - Area: [AREA] sq. m. + Area: [AREA] m² </text> <button follows="left|top" - height="20" - label="About Land..." - label_selected="About Land..." + height="23" + label="About Land" + label_selected="About Land" layout="topleft" left_delta="0" name="button about land" top_pad="4" - width="112" /> + width="125" /> <check_box control_name="ShowParcelOwners" - height="16" + height="19" label="Show owners" layout="topleft" left_delta="0" name="checkbox show owners" - tool_tip="Colour parcels according to their ownership" + tool_tip="Colorize the parcels according to the type of owner: Green = Your land Aqua = Your group's land Red = Owned by others Yellow = For sale Purple = For auction Grey = Public" top_pad="8" - width="100" /> - <button - follows="left|top" - height="18" - label="?" - label_selected="?" - layout="topleft" - left_delta="94" - name="button show owners help" - top_delta="-2" - width="18" /> + width="205" /> <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_modify" top="152" - width="150"> + width="240"> Modify Parcel </text> <button follows="left|top" - height="20" - label="Subdivide..." - label_selected="Subdivide..." + height="23" + label="Subdivide" + label_selected="Subdivide" layout="topleft" - left="48" + left="30" name="button subdivide land" top="172" - width="112" /> + width="125" /> <button follows="left|top" - height="20" - label="Join..." - label_selected="Join..." + height="23" + label="Join" + label_selected="Join" layout="topleft" left_delta="0" name="button join land" top_pad="4" - width="112" /> + width="125" /> <text type="string" length="1" + font="SansSerifBig" follows="left|top" - height="16" + height="19" layout="topleft" - left="40" + left="20" name="label_parcel_trans" top="256" - width="150"> + width="240"> Land Transactions </text> <button follows="left|top" - height="20" - label="Buy Land..." - label_selected="Buy Land..." + height="23" + label="Buy Land" + label_selected="Buy Land" layout="topleft" - left="48" + left="30" name="button buy land" top="276" - width="112" /> + width="125" /> <button follows="left|top" - height="20" - label="Abandon Land..." - label_selected="Abandon Land..." + height="23" + label="Abandon Land" + label_selected="Abandon Land" layout="topleft" left_delta="0" name="button abandon land" top_pad="4" - width="112" /> - </panel> + width="125" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 20e39beb6f..b06c6dc215 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="350" layout="topleft" min_height="300" min_width="450" name="top_objects" - title="loading..." - width="550"> + help_topic="top_objects" + title="Top Objects" + width="800"> <floater.string name="top_scripts_title"> Top Scripts @@ -44,25 +46,25 @@ type="string" length="1" follows="left|top" - font="SansSerif" height="20" layout="topleft" left="10" name="title_text" - top="30" + top="20" + text_color="EmphasisColor" width="400"> Loading... </text> <scroll_list draw_heading="true" - follows="left|top|bottom|right" - height="150" + follows="all" + height="170" layout="topleft" left_delta="0" multi_select="true" name="objects_list" - top_delta="20" - width="530"> + top_delta="17" + width="780"> <scroll_list.columns label="Score" name="score" @@ -82,11 +84,17 @@ <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> <text type="string" @@ -105,19 +113,22 @@ follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="id_editor" top_delta="-3" - width="350" /> + width="575" /> <button follows="bottom|right" - height="20" + height="23" label="Show Beacon" layout="topleft" - left_pad="10" + left_pad="5" name="show_beacon_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.ShowBeacon" /> + </button> <text type="string" length="1" @@ -125,28 +136,31 @@ height="20" layout="topleft" left="10" + top_pad="5" name="obj_name_text" - top="237" width="100"> - Object Name: + Object name: </text> <line_editor follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="object_name_editor" top_delta="-3" - width="350" /> + width="575" /> <button follows="bottom|right" - height="20" + height="23" label="Filter" layout="topleft" - left_pad="10" + left_pad="5" name="filter_object_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.GetByObjectName" /> + </button> <text type="string" length="1" @@ -154,71 +168,89 @@ height="20" layout="topleft" left="10" + top_pad="5" name="owner_name_text" - top="264" width="100"> - Owner Name: + Owner: </text> <line_editor follows="left|bottom|right" height="20" layout="topleft" - left_delta="70" + left_pad="3" name="owner_name_editor" top_delta="-3" - width="350" /> + width="575" /> <button follows="bottom|right" - height="20" + height="23" label="Filter" layout="topleft" - left_pad="10" + left_pad="5" name="filter_owner_btn" top_delta="0" - width="100" /> + width="100"> + <button.commit_callback + function="TopObjects.GetByOwnerName" /> + </button> + <button + follows="bottom|right" + height="22" + image_overlay="Refresh_Off" + layout="topleft" + name="refresh_btn" + right="-8" + top_pad="5" + width="23"> + <button.commit_callback + function="TopObjects.Refresh" /> + </button> <button follows="bottom|left" - height="20" + height="23" label="Return Selected" layout="topleft" - left="10" + left="112" + top_delta="0" name="return_selected_btn" - top="295" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.ReturnSelected" /> + </button> <button follows="bottom|left" - height="20" + height="23" label="Return All" layout="topleft" left_pad="10" name="return_all_btn" top_delta="0" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.ReturnAll" /> + </button> <button follows="bottom|left" - height="20" + height="23" label="Disable Selected" layout="topleft" - left="10" + + left="112" name="disable_selected_btn" - top="320" - width="130" /> + width="130"> + <button.commit_callback + function="TopObjects.DisableSelected" /> + </button> <button follows="bottom|left" - height="20" + height="23" label="Disable All" layout="topleft" left_pad="10" name="disable_all_btn" top_delta="0" - width="130" /> - <button - bottom="315" - follows="bottom|right" - height="20" - label="Refresh" - layout="topleft" - name="refresh_btn" - right="-10" - width="100" /> + width="130"> + <button.commit_callback + function="TopObjects.DisableAll" /> + </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index 6585667c8b..af1617eb39 100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_close="false" can_minimize="false" height="500" @@ -10,6 +11,10 @@ name="real_url"> http://secondlife.com/app/tos/ </floater.string> + <floater.string + name="loading_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 + </floater.string> <button enabled="false" height="20" @@ -32,7 +37,7 @@ <check_box follows="top|right" height="16" - label="I Agree to the Terms of Service" + label="I Agree to the Terms of Service and Privacy Policy" layout="topleft" left_delta="0" name="agree_chk" @@ -48,32 +53,17 @@ 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 and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement. </text> - <text_editor - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="283" - layout="topleft" - left_delta="0" - max_length="65536" - name="tos_text" - top_pad="43" - width="568" - word_wrap="true"> - TOS_TEXT - </text_editor> <web_browser + trusted_content="true" follows="left|top" height="340" layout="topleft" 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="-27" + top_delta="40" width="568" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 10968364f3..3b10a57c50 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" height="640" layout="topleft" min_height="230" min_width="650" name="gui_preview_tool" + help_topic="gui_preview_tool" single_instance="true" - title="XUI Preview Tool" + title="XUI PREVIEW TOOL" + translate="false" width="750"> <panel bottom="640" @@ -16,7 +19,7 @@ left="0" mouse_opaque="false" name="main_panel" - right="650" + right="750" top="0"> <text type="string" @@ -41,13 +44,14 @@ width="55"> <combo_box.item label="en" + name="item1" value="en" /> </combo_box> <button follows="left|top" height="25" - label="Display Floater" - label_selected="Display Floater" + label="Show" + label_selected="Show" layout="topleft" left_pad="10" name="display_floater" @@ -58,8 +62,8 @@ enabled="false" follows="left|top" height="25" - label="Close Floater" - label_selected="Close Floater" + label="Hide" + label_selected="Hide" layout="topleft" left_pad="10" name="close_displayed_floater" @@ -69,8 +73,8 @@ <button follows="left|top" height="25" - label="Edit Floater..." - label_selected="Edit Floater..." + label="Edit..." + label_selected="Edit..." layout="topleft" left_pad="10" name="edit_floater" @@ -100,7 +104,6 @@ top_delta="0" width="85" /> <button - enabled="false" follows="right|top" height="25" is_toggle="true" @@ -109,7 +112,7 @@ layout="topleft" left_pad="15" name="toggle_overlap_panel" - tool_tip="Toggle highlighting and display panel for overlapping elements; right click an element to select it for this feature. The selected element is marked by a red rectangle." + tool_tip="Toggle highlighting and display panel for overlapping elements; right-click an element to select it for this feature. The selected element is marked by a red rectangle." top_delta="0" width="30" /> <text @@ -136,13 +139,13 @@ width="55"> <combo_box.item label="en" + name="item1" value="en" /> </combo_box> <button follows="left|top" height="25" - label="Display Floater" - label_selected="Display Floater" + label="Show" layout="topleft" left_pad="10" name="display_floater_2" @@ -153,14 +156,31 @@ enabled="false" follows="left|top" height="25" - label="Close Floater" - label_selected="Close Floater" + label="Hide" layout="topleft" left_pad="10" name="close_displayed_floater_2" tool_tip="Closes the currently-displayed floater, if one exists" top_delta="0" width="85" /> + <button + follows="left|top" + height="25" + label="Export Schema" + layout="topleft" + left_pad="10" + name="export_schema" + top_delta="0" + width="120" /> + <check_box + follows="left|top" + label="Show Rectangles" + name="show_rectangles" + left_pad="10" + top_delta="0" + height="25" + width="120" /> + <scroll_list bottom="525" column_padding="0" @@ -183,7 +203,7 @@ name="file_column" width="150" /> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" label="Top-Level Node" name="top_level_node_column" /> </scroll_list> @@ -218,7 +238,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="100" @@ -258,7 +277,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="100" @@ -300,7 +318,6 @@ border_thickness="1" follows="left|bottom" font="SansSerif" - handle_edit_keys_directly="true" height="20" layout="topleft" left_delta="65" @@ -337,14 +354,22 @@ </panel> <scroll_container follows="top|right|bottom" - height="637" + height="600" layout="topleft" - left_delta="550" + left="750" name="overlap_scroll" reserve_scroll_corner="true" - top_delta="2" + top="20" width="300"> - <panel + <panel + border="true" + name="overlap_dummy_panel" + top="0" + left="0" + width="300" + height="600" + > + <overlap_panel background_opaque="true" background_visible="true" bevel_style="in" @@ -352,14 +377,14 @@ bg_opaque_color="1 1 1 1" border="true" follows="top|right|bottom" - height="637" + height="600" label="Overlap Panel" layout="topleft" - left_delta="0" + left="0" min_width="300" name="overlap_panel" tool_tip="This panel displays the currently-selected element and all of the elements that overlap it, separated by horizontal lines" - top="-607" + top="0" visible="false" width="300" /> <text @@ -370,12 +395,11 @@ height="30" layout="topleft" left="10" - left_delta="10" name="overlap_panel_label" - right="-50" - top="0" + top="10" width="150"> Overlapping Elements: </text> + </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 82a9750cda..29fb29fabf 100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_minimize="false" height="87" layout="topleft" name="url_entry" - width="500"> + help_topic="url_entry" + width="280"> <text type="string" length="1" @@ -12,7 +14,7 @@ follows="top|left" height="15" layout="topleft" - left="20" + left="10" name="media_label" top="20"> Media URL: @@ -26,13 +28,13 @@ max_chars="255" name="media_entry" top_delta="-4" - width="370" /> + width="190" /> <button follows="top|left" height="20" label="OK" layout="topleft" - left="20" + left="10" name="ok_btn" top="50" width="64" /> @@ -41,7 +43,7 @@ height="20" label="Cancel" layout="topleft" - left_pad="28" + left_pad="5" name="cancel_btn" top_delta="0" width="64" /> @@ -50,20 +52,21 @@ height="20" label="Clear" layout="topleft" - left_pad="220" + left_pad="65" name="clear_btn" top_delta="0" width="64" /> <text type="string" length="1" + font="SansSerifSmall" bottom_delta="-2" follows="bottom|left" height="15" layout="topleft" - left="220" + left="152" name="loading_label" - visible="false"> + visible="true"> Loading... </text> </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 new file mode 100644 index 0000000000..1432099590 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + can_minimize="true" + can_close="false" + height="205" + layout="topleft" + min_height="124" + min_width="190" + name="floater_voice_controls" + help_topic="floater_voice_controls" + title="Voice Controls" + save_dock_state="true" + save_visibility="true" + save_rect="true" + single_instance="true" + width="282"> + <string + name="title_nearby"> + NEARBY VOICE + </string> + <string + name="title_group"> + Group Call with [GROUP] + </string> + <string + name="title_adhoc"> + Conference Call + </string> + <string + name="title_peer_2_peer"> + Call with [NAME] + </string> + <string + name="no_one_near"> + No one near has voice enabled + </string> + <layout_stack + clip="false" + follows="all" + height="189" + layout="topleft" + left="10" + 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="20" + name="my_panel"> + <avatar_icon + enabled="false" + follows="left|top" + height="18" + default_icon_name="Generic_Person" + layout="topleft" + left="5" + name="user_icon" + top="0" + width="18" /> + <text + follows="top|left|right" + font="SansSerifSmallBold" + height="16" + layout="topleft" + left_pad="10" + name="user_text" + text_color="white" + top="4" + use_ellipses="true" + value="My Avatar:" + width="210" /> + <output_monitor + auto_update="true" + draw_border="false" + follows="top|right" + height="16" + layout="topleft" + right="-3" + name="speaking_indicator" + left_pad="5" + visible="true" + width="20" /> + </layout_panel> + <layout_panel name="leave_call_panel" height="26" auto_resize="false"> + <layout_stack + clip="true" + auto_resize="false" + follows="left|top|right" + height="26" + layout="topleft" + mouse_opaque="false" + name="voice_effect_and_leave_call_stack" + orientation="horizontal" + width="262"> + <layout_panel + height="26" + width="200"> + <panel + class="panel_voice_effect" + name="panel_voice_effect" + visiblity_control="VoiceMorphingEnabled" + filename="panel_voice_effect.xml" /> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + follows="top|right" + height="23" + visible="true" + layout="topleft" + name="leave_call_btn_panel" + width="100"> + <button + follows="right|top" + height="23" + label="Leave Call" + name="leave_call_btn" + width="100" /> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + follows="all" + layout="topleft" + left="2" + top_pad="0" + height="132" + name="callers_panel" + user_resize="false" + width="280"> + <avatar_list + follows="all" + height="132" + ignore_online_status="true" + layout="topleft" + multi_select="true" + name="speakers_list" + width="280" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="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/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml new file mode 100644 index 0000000000..9bf9cc6c77 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="27" + can_resize="true" + height="500" + name="voice_effects" + help_topic="voice_effects" + title="VOICE MORPHING" + background_visible="true" + follows="all" + label="Places" + layout="topleft" + min_height="360" + min_width="200" + width="300"> + <string name="no_voice_effect"> + (No Voice Morph) + </string> + <string name="active_voice_effect"> + (Active) + </string> + <string name="unsubscribed_voice_effect"> + (Unsubscribed) + </string> + <string name="new_voice_effect"> + (New!) + </string> + <text + height="16" + word_wrap="true" + use_ellipses="true" + type="string" + follows="left|top|right" + layout="topleft" + font="SansSerifBold" + color="White" + left="10" + name="preview_text" + right="-10" + top="27">To Preview + </text> + <text + height="23" + word_wrap="true" + use_ellipses="true" + type="string" + follows="left|top|right" + layout="topleft" + left="10" + name="status_text" + right="-5" + top_pad="0"> +Record a sample, then click on a voice to hear how it will sound. + </text> + <button + follows="left|top" + height="23" + label="Record" + layout="topleft" + left="10" + name="record_btn" + tool_tip="Record a sample of your voice." + top_pad="5" + width="100"> + <button.commit_callback + function="VoiceEffect.Record" /> + </button> + <button + follows="left|top" + height="23" + label="Stop" + layout="topleft" + left_delta="0" + name="record_stop_btn" + top_delta="0" + width="100"> + <button.commit_callback + function="VoiceEffect.Stop" /> + </button> + <text + height="23" + halign="right" + use_ellipses="true" + type="string" + follows="left|top|right" + layout="topleft" + left_pad="10" + top_delta="10" + name="voice_morphing_link" + right="-10"> + [[URL] Subscribe Now] + </text> + <scroll_list + bottom="-10" + draw_heading="true" + follows="all" + layout="topleft" + left="10" + multi_select="false" + name="voice_effect_list" + right="-10" + tool_tip="Record a sample of your voice, then click an effect to preview." + top="95"> + <scroll_list.columns + label="Voice Name" + name="name" + relative_width="0.60" /> + <scroll_list.columns + dynamic_width="true" + label="Expires" + name="expires" + relative_width="0.30" /> + </scroll_list> + +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 07ebf734ea..3a44ba3763 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" height="240" layout="topleft" name="Water Floater" + help_topic="water_floater" save_rect="true" - title="Advanced Water Editor" + title="ADVANCED WATER EDITOR" width="700"> <floater.string name="WLDefaultWaterNames"> @@ -14,52 +16,54 @@ type="string" length="1" follows="left|top|right" - font="SansSerif" height="16" layout="topleft" left="10" name="KeyFramePresetsText" top="34" - width="110"> + font="SansSerif" + width="85"> Water Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="110" + left_delta="95" name="WaterPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WaterNewPreset" - top_delta="1" + top_delta="0" width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WaterSavePreset" top_delta="0" width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WaterDeletePreset" top_delta="0" width="70" /> <tab_container + border="false" follows="left|top" height="180" + halign="center" layout="topleft" left="0" name="Water Tabs" @@ -68,14 +72,15 @@ width="700"> <panel border="true" - follows="left|top|right|bottom" + follows="all" height="180" - label="Settings" + label="SETTINGS" layout="topleft" - left="1" + left="0" mouse_opaque="false" + help_topic="water_settings_tab" name="Settings" - top="60" + top="0" width="698"> <text type="string" @@ -87,21 +92,10 @@ left="10" name="BHText" top="4" - width="355"> + width="200"> Water Fog Color </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterFogColorHelp" - top_delta="-2" - width="18" /> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" color="0.5 0.5 0.5 1" follows="left|top" @@ -109,7 +103,7 @@ layout="topleft" left="40" name="WaterFogColor" - tool_tip="Click to open Color Picker" + tool_tip="Click to open color picker" top="30" width="40" /> <text @@ -121,20 +115,10 @@ layout="topleft" left="10" name="WaterFogDensText" - top="74" - width="355"> + top="84" + width="200"> Fog Density Exponent </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterFogDensityHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterFogDensity" decimal_digits="1" @@ -145,7 +129,7 @@ left="24" max_val="10" name="WaterFogDensity" - top="110" + top="124" width="200" /> <text type="string" @@ -156,20 +140,10 @@ layout="topleft" left_delta="-14" name="WaterUnderWaterFogModText" - top_delta="4" - width="355"> + top="124" + width="200"> Underwater Fog Modifier </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterUnderWaterFogModHelp" - top_delta="-2" - width="18" /> <slider decimal_digits="2" follows="left" @@ -180,7 +154,7 @@ left="24" max_val="2" name="WaterUnderWaterFogMod" - top="150" + top="164" width="200" /> <text type="string" @@ -192,93 +166,44 @@ left="245" name="BDensText" top="4" - width="355"> + width="200"> Reflection Wavelet Scale </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterNormalScaleHelp" - top_delta="-2" - width="18" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText2" - top="21" - width="10"> - 1 - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - 2 - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - 3 - </text> <slider control_name="WaterNormalScaleX" decimal_digits="1" follows="left" - height="10" + height="15" initial_value="0.7" + label="1" layout="topleft" - left_pad="4" max_val="10" name="WaterNormalScaleX" - top_delta="-3" + top_pad="24" width="200" /> <slider control_name="WaterNormalScaleY" decimal_digits="1" follows="left" - height="10" + height="15" initial_value="0.7" + label="2" layout="topleft" - left_delta="0" max_val="10" name="WaterNormalScaleY" - top_pad="1" + top_pad="4" width="200" /> <slider control_name="WaterNormalScaleZ" decimal_digits="1" follows="left" - height="10" + height="15" initial_value="0.7" + label="3" layout="topleft" - left_delta="0" max_val="10" name="WaterNormalScaleZ" - top_pad="1" + top_pad="4" width="200" /> <text type="string" @@ -287,22 +212,11 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" name="HDText" - top_delta="2" - width="355"> + top="84" + width="200"> Fresnel Scale </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterFresnelScaleHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterFresnelScale" decimal_digits="2" @@ -311,9 +225,8 @@ increment="0.01" initial_value="0.7" layout="topleft" - left="259" name="WaterFresnelScale" - top="100" + top="124" width="200" /> <text type="string" @@ -322,22 +235,11 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" name="FresnelOffsetText" - top_delta="-1" - width="355"> + top="124" + width="200"> Fresnel Offset </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterFresnelOffsetHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterFresnelOffset" decimal_digits="2" @@ -346,9 +248,8 @@ increment="0.01" initial_value="0.7" layout="topleft" - left="259" name="WaterFresnelOffset" - top="135" + top="164" width="200" /> <text type="string" @@ -360,19 +261,9 @@ left="480" name="DensMultText" top="4" - width="355"> + width="200"> Refract Scale Above </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterScaleAboveHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterScaleAbove" decimal_digits="2" @@ -383,7 +274,7 @@ layout="topleft" left="494" name="WaterScaleAbove" - top="40" + top="44" width="200" /> <text type="string" @@ -394,20 +285,10 @@ layout="topleft" left_delta="-14" name="WaterScaleBelowText" - top_delta="-3" - width="355"> + top="44" + width="200"> Refract Scale Below </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterScaleBelowHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterScaleBelow" decimal_digits="2" @@ -418,7 +299,7 @@ layout="topleft" left="494" name="WaterScaleBelow" - top="73" + top="84" width="200" /> <text type="string" @@ -429,20 +310,10 @@ layout="topleft" left_delta="-14" name="MaxAltText" - top_delta="-2" - width="355"> + top="84" + width="200"> Blur Multiplier </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WaterBlurMultiplierHelp" - top_delta="-2" - width="18" /> <slider control_name="WaterBlurMult" follows="left" @@ -453,19 +324,20 @@ left="494" max_val="0.16" name="WaterBlurMult" - top="107" + top="124" width="200" /> </panel> <panel border="true" - follows="left|top|right|bottom" + follows="all" height="180" - label="Image" + label="IMAGE" layout="topleft" - left_delta="0" + left="0" mouse_opaque="false" + help_topic="water_waves_tab" name="Waves" - top_delta="44" + top="0" width="698"> <text type="string" @@ -477,19 +349,9 @@ left="10" name="BHText" top="4" - width="355"> + width="200"> Big Wave Direction </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="145" - name="WaterWave1Help" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -499,23 +361,10 @@ layout="topleft" left="10" name="WaterWave1DirXText" - top="21" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave1DirYText" - top_delta="11" - width="10"> - Y - </text> <slider control_name="WaterWave1DirX" decimal_digits="2" @@ -528,8 +377,22 @@ max_val="4" min_val="-4" name="WaterWave1DirX" - top="40" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave1DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave1DirY" decimal_digits="2" @@ -542,7 +405,8 @@ max_val="4" min_val="-4" name="WaterWave1DirY" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -551,22 +415,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="BHText2" - top_delta="3" + top_pad="-10" width="355"> Little Wave Direction </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="145" - name="WaterWave2Help" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -575,24 +429,12 @@ height="16" layout="topleft" left="10" + left_delta="0" name="WaterWave2DirXText" - top="71" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave2DirYText" - top_delta="11" - width="10"> - Y - </text> <slider control_name="WaterWave2DirX" decimal_digits="2" @@ -605,8 +447,22 @@ max_val="4" min_val="-4" name="WaterWave2DirX" - top="90" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave2DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave2DirY" decimal_digits="2" @@ -619,7 +475,8 @@ max_val="4" min_val="-4" name="WaterWave2DirY" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -631,19 +488,9 @@ left="240" name="BHText3" top="4" - width="355"> + width="200"> Normal Map </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="125" - name="WaterNormalMapHelp" - top_delta="-2" - width="18" /> <texture_picker height="143" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml deleted file mode 100644 index ee67989d33..0000000000 --- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - 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 item 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"> - New [DESC] - </line_editor> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml new file mode 100644 index 0000000000..897d959b98 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + can_minimize="false" + height="108" + layout="topleft" + name="whitelist_entry" + single_instance="true" + help_topic="whitelist_entry" + title="WHITELIST ENTRY" + width="390"> + + <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft" + left="10" name="media_label" top="20"> + Enter a URL or URL pattern to add to the list of allowed domains + </text> + + <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif" + height="20" left="10" name="whitelist_entry" + tool_tip="Enter a URL or URL pattern to White List" + width="350" /> + + <button follows="top|left" height="20" label="OK" + layout="topleft" left="10" name="ok_btn" bottom_delta="28" width="64" /> + + <button follows="top|left" height="20" label="Cancel" + layout="topleft" left_pad="5" name="cancel_btn" bottom_delta="0" width="64" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 5257cc687e..85a5be369c 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="220" + legacy_header_height="18" + height="256" layout="topleft" name="WindLight floater" + help_topic="windlight_floater" save_rect="true" - title="Advanced Sky Editor" + title="ADVANCED SKY EDITOR" width="700"> <floater.string name="WLDefaultSkyNames"> @@ -20,55 +22,53 @@ left="10" name="KeyFramePresetsText" top="34" - width="110"> + width="85"> Sky Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="110" + left_delta="85" name="WLPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WLNewPreset" - top_delta="1" width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WLSavePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WLDeletePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Day Cycle Editor" label_selected="Day Cycle Editor" layout="topleft" - left_pad="50" + right="-10" name="WLDayCycleMenuButton" - top_delta="0" + top_pad="-23" width="120" /> <tab_container follows="left|top" - height="160" + height="196" + halign="center" layout="topleft" left="0" name="WindLight Tabs" @@ -78,11 +78,12 @@ <panel border="true" follows="left|top|right|bottom" - height="160" - label="Atmosphere" + height="196" + label="ATMOSPHERE" layout="topleft" left="1" mouse_opaque="false" + help_topic="windlight_atmosphere_tab" name="Atmosphere" top="60" width="698"> @@ -99,16 +100,6 @@ width="355"> Blue Horizon </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLBlueHorizonHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -118,10 +109,22 @@ layout="topleft" left="10" name="BHText2" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueHorizonR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueHorizonR" + width="200" /> <text type="string" length="1" @@ -129,12 +132,25 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="10" + top_pad="-15" name="BHText3" - top_delta="11" width="10"> G </text> + <slider + control_name="WLBlueHorizonG" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="0" + name="WLBlueHorizonG" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -142,12 +158,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText4" - top_delta="11" + left="10" + top_pad="-15" width="10"> B </text> + <slider + control_name="WLBlueHorizonB" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + name="WLBlueHorizonB" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -155,49 +183,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText5" - top_delta="11" + left="10" + top_pad="-15" width="10"> I </text> <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLBlueHorizonR" - top="40" - width="200" /> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - top_pad="1" - width="200" /> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonB" - top_pad="1" - width="200" /> - <slider control_name="WLBlueHorizonI" decimal_digits="2" follows="left" @@ -205,9 +197,9 @@ increment="0.01" initial_value="1.0" layout="topleft" - left_delta="0" name="WLBlueHorizonI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -216,22 +208,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="10" + top_pad="-10" name="BDensText" - top_delta="-2" width="355"> Haze Horizon </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLHazeHorizonHelp" - top_delta="-2" - width="18" /> <slider control_name="WLHazeHorizon" decimal_digits="2" @@ -240,9 +222,10 @@ increment="0.01" initial_value="0.25" layout="topleft" - left="24" + left="23" + top_delta="0" + top_pad="27" name="WLHazeHorizon" - top="107" width="200" /> <text type="string" @@ -257,16 +240,6 @@ width="355"> Blue Density </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLBlueDensityHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -276,10 +249,22 @@ layout="topleft" left="245" name="BHText6" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueDensityR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueDensityR" + width="200" /> <text type="string" length="1" @@ -287,50 +272,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="245" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText9" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLBlueDensityR" - top="40" - width="200" /> <slider control_name="WLBlueDensityG" decimal_digits="2" @@ -341,8 +288,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText8" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLBlueDensityB" decimal_digits="2" @@ -353,8 +314,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText9" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLBlueDensityI" decimal_digits="2" @@ -365,7 +340,8 @@ layout="topleft" left_delta="0" name="WLBlueDensityI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -374,22 +350,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="245" name="HDText" - top_delta="-2" + top_pad="-10" width="355"> Haze Density </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLHazeDensityHelp" - top_delta="-2" - width="18" /> <slider control_name="WLHazeDensity" decimal_digits="2" @@ -398,10 +364,10 @@ increment="0.01" initial_value="0.7" layout="topleft" - left="259" + left="258" max_val="4" name="WLHazeDensity" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -416,16 +382,6 @@ width="355"> Density Multiplier </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLDensityMultHelp" - top_delta="-2" - width="18" /> <slider control_name="WLDensityMult" decimal_digits="2" @@ -434,10 +390,10 @@ increment="0.01" initial_value="0.1" layout="topleft" - left="494" + left_delta="13" max_val="0.9" name="WLDensityMult" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -446,22 +402,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLDistanceMultText" - top_delta="-3" + top_pad="-10" width="355"> Distance Multiplier </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLDistanceMultHelp" - top_delta="-2" - width="18" /> <slider control_name="WLDistancMult" decimal_digits="1" @@ -469,11 +415,11 @@ height="10" initial_value="1.0" layout="topleft" - left="494" + left_delta="13" max_val="100" name="WLDistanceMult" - top="73" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -481,22 +427,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="MaxAltText" - top_delta="-2" + top_pad="-15" width="355"> Max Altitude </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLMaxAltitudeHelp" - top_delta="-2" - width="18" /> <slider control_name="WLMaxAltitude" decimal_digits="0" @@ -505,19 +441,20 @@ increment="1" initial_value="500" layout="topleft" - left="494" + left_delta="13" max_val="4000" name="WLMaxAltitude" - top="107" - width="205" /> + top_pad="27" + width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Lighting" + height="196" + label="LIGHTING" layout="topleft" left_delta="0" + help_topic="windlight_lighting_tab" name="Lighting" top_delta="4" width="698"> @@ -534,16 +471,6 @@ width="355"> Sun/Moon Color </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLSunlightColorHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -551,12 +478,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLSunlightR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLSunlightR" + width="200" /> <text type="string" length="1" @@ -564,50 +503,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLSunlightR" - top="40" - width="200" /> <slider control_name="WLSunlightG" decimal_digits="2" @@ -618,8 +519,22 @@ layout="topleft" left_delta="0" name="WLSunlightG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLSunlightB" decimal_digits="2" @@ -630,8 +545,22 @@ layout="topleft" left_delta="0" name="WLSunlightB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLSunlightI" decimal_digits="2" @@ -642,7 +571,8 @@ layout="topleft" left_delta="0" name="WLSunlightI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -651,29 +581,19 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="TODText" - top_delta="-2" + top_pad="-10" width="355"> Sun/Moon Position </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLTimeOfDayHelp" - top_delta="-2" - width="18" /> <icon height="20" image_name="icon_diurnal.tga" layout="topleft" - left="30" + left_delta="14" + top_pad="10" name="SkyDayCycle" - top="97" width="148" /> <slider control_name="WLSunAngle" @@ -682,10 +602,10 @@ increment="0.001" initial_value="0.7" layout="topleft" - left="24" + left_delta="-8" name="WLSunAngle" - top="137" - width="204" /> + top_pad="20" + width="207" /> <text type="string" length="1" @@ -699,16 +619,6 @@ width="355"> Ambient </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLAmbientHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -716,12 +626,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText5" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLAmbientR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLAmbientR" + width="200" /> <text type="string" length="1" @@ -729,50 +651,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText7" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLAmbientR" - top="40" - width="200" /> <slider control_name="WLAmbientG" decimal_digits="2" @@ -783,8 +667,22 @@ layout="topleft" left_delta="0" name="WLAmbientG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText7" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLAmbientB" decimal_digits="2" @@ -795,8 +693,22 @@ layout="topleft" left_delta="0" name="WLAmbientB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText8" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLAmbientI" decimal_digits="2" @@ -807,7 +719,8 @@ layout="topleft" left_delta="0" name="WLAmbientI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -816,22 +729,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLEastAngleText" - top_delta="-2" + top_pad="-10" width="355"> East Angle </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLEastAngleHelp" - top_delta="-2" - width="18" /> <slider control_name="WLEastAngle" decimal_digits="2" @@ -840,9 +743,9 @@ increment="0.01" initial_value="0.0" layout="topleft" - left="259" + left_delta="13" name="WLEastAngle" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -857,16 +760,6 @@ width="355"> Sun Glow </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLSunGlowHelp" - top_delta="-2" - width="18" /> <slider control_name="WLGlowB" decimal_digits="2" @@ -876,10 +769,10 @@ initial_value="0.1" label="Focus " layout="topleft" - left="494" + left_delta="0" max_val="0.5" name="WLGlowB" - top="40" + top_pad="27" width="200" /> <slider control_name="WLGlowR" @@ -894,7 +787,7 @@ max_val="1.99" min_val="1" name="WLGlowR" - top_pad="1" + top_pad="6" width="200" /> <text type="string" @@ -903,22 +796,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="SceneGammaText" - top_delta="0" + top_pad="-10" width="200"> Scene Gamma </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLSceneGammaHelp" - top_delta="-2" - width="18" /> <slider control_name="WLGamma" decimal_digits="2" @@ -927,11 +810,11 @@ increment="0.01" initial_value="2.0" layout="topleft" - left="494" + left_delta="0" max_val="10" name="WLGamma" - top="87" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -939,22 +822,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="WLStarText" - top_delta="-1" + top_pad="-10" width="355"> Star Brightness </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLStarBrightnessHelp" - top_delta="-2" - width="18" /> <slider control_name="WLStarAlpha" decimal_digits="2" @@ -963,20 +836,21 @@ increment="0.01" initial_value="0" layout="topleft" - left="494" + left_delta="0" max_val="2" name="WLStarAlpha" - top="122" + top_pad="27" width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Clouds" + height="196" + label="CLOUDS" layout="topleft" left_delta="0" mouse_opaque="false" + help_topic="windlight_clouds_tab" name="Clouds" top_delta="4" width="698"> @@ -993,16 +867,6 @@ width="355"> Cloud Color </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLCloudColorHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -1010,12 +874,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLCloudColorR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudColorR" + width="200" /> <text type="string" length="1" @@ -1023,50 +899,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLCloudColorR" - top="40" - width="200" /> <slider control_name="WLCloudColorG" decimal_digits="2" @@ -1077,8 +915,22 @@ layout="topleft" left_delta="0" name="WLCloudColorG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLCloudColorB" decimal_digits="2" @@ -1089,8 +941,22 @@ layout="topleft" left_delta="0" name="WLCloudColorB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLCloudColorI" decimal_digits="2" @@ -1101,7 +967,8 @@ layout="topleft" left_delta="0" name="WLCloudColorI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -1110,22 +977,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudColorText2" - top_delta="-2" + top_pad="-10" width="355"> Cloud XY/Density </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLCloudDensityHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -1133,12 +990,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText5" - top="87" + top_pad="5" width="10"> X </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudX" + width="200" /> <text type="string" length="1" @@ -1146,12 +1015,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> Y </text> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudY" + width="200" /> <text type="string" length="1" @@ -1159,37 +1040,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> D </text> <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudX" - top_delta="-2" - width="200" /> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudY" - top_pad="1" - width="200" /> - <slider control_name="WLCloudDensity" decimal_digits="2" follows="left" @@ -1199,7 +1056,8 @@ layout="topleft" left_delta="0" name="WLCloudDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -1214,16 +1072,6 @@ width="355"> Cloud Coverage </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLCloudCoverageHelp" - top_delta="-2" - width="18" /> <slider control_name="WLCloudCoverage" decimal_digits="2" @@ -1232,9 +1080,9 @@ increment="0.01" initial_value="0.5" layout="topleft" - left="259" + left_delta="13" name="WLCloudCoverage" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -1243,22 +1091,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudScaleText" - top_delta="-1" + top_pad="-10" width="355"> Cloud Scale </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLCloudScaleHelp" - top_delta="-2" - width="18" /> <slider control_name="WLCloudScale" decimal_digits="2" @@ -1267,10 +1105,10 @@ increment="0.01" initial_value="1.0" layout="topleft" - left="259" + left_delta="13" min_val="0.01" name="WLCloudScale" - top="75" + top_pad="27" width="200" /> <text type="string" @@ -1279,22 +1117,12 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudDetailText" - top_delta="-4" + top_pad="-10" width="355"> Cloud Detail (XY/Density) </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="150" - name="WLCloudDetailHelp" - top_delta="-2" - width="18" /> <text type="string" length="1" @@ -1302,12 +1130,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText8" - top="87" + top_pad="8" width="10"> X </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="8" + name="WLCloudDetailX" + width="200" /> <text type="string" length="1" @@ -1315,37 +1155,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText9" - top_delta="11" + top_pad="-15" width="10"> Y </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText10" - top_delta="11" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudDetailX" - top_delta="-2" - width="200" /> <slider control_name="WLCloudDetailY" decimal_digits="2" @@ -1356,8 +1171,22 @@ layout="topleft" left_delta="0" name="WLCloudDetailY" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText10" + top_pad="-15" + width="10"> + D + </text> <slider control_name="WLCloudDetailDensity" decimal_digits="2" @@ -1368,7 +1197,8 @@ layout="topleft" left_delta="0" name="WLCloudDetailDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -1383,16 +1213,6 @@ width="355"> Cloud Scroll X </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="125" - name="WLCloudScrollXHelp" - top_delta="-2" - width="18" /> <check_box control_name="WLCloudLockX" follows="left" @@ -1429,16 +1249,6 @@ width="355"> Cloud Scroll Y </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="125" - name="WLCloudScrollYHelp" - top_delta="-2" - width="18" /> <check_box control_name="WLCloudLockY" follows="left" @@ -1472,16 +1282,6 @@ name="DrawClassicClouds" top="104" width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left="608" - name="WLClassicCloudsHelp" - top="84" - width="18" /> </panel> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml new file mode 100644 index 0000000000..355d257785 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_window_size.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_minimize="false" + can_resize="false" + height="105" + layout="topleft" + name="window_size" + title="WINDOW SIZE" + width="205"> + <string name="resolution_format">[RES_X] x [RES_Y]</string> + <text + follows="top|left" + font="SansSerif" + height="16" + left="15" + top="10" + name="windowsize_text" + width="280"> + Set window size: + </text> + <combo_box + allow_text_entry="true" + height="23" + follows="left|top" + left_delta="0" + max_chars="20" + name="window_size_combo" + tool_tip="width x height" + top_pad="5" + width="179"> + <combo_box.item + label="1000 x 700 (default)" + name="item0" + value="1000 x 700" /> + <combo_box.item + label="1024 x 768" + name="item1" + value="1024 x 768" /> + <combo_box.item + label="1280 x 720 (720p)" + name="item2" + value="1280 x 720" /> + <combo_box.item + label="1920 x 1080 (1080p)" + name="item3" + value="1920 x 1080" /> + </combo_box> + <button + follows="right|bottom" + height="23" + label="Set" + left_delta="0" + name="set_btn" + top_pad="10" + width="85" /> + <button + follows="right|bottom" + height="23" + label="Cancel" + left_pad="5" + name="cancel_btn" + top_delta="0" + width="85" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 43f209546a..20629018e2 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -1,102 +1,193 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + legacy_header_height="18" can_resize="true" - center_horiz="true" - center_vert="true" + open_centered="true" height="600" layout="topleft" min_height="520" min_width="520" name="worldmap" + help_topic="worldmap" save_rect="true" save_visibility="true" single_instance="true" - title="World Map" - width="800"> - <tab_container - follows="left|top|right|bottom" - height="565" + title="WORLD MAP" + width="650"> + <panel + filename="panel_world_map.xml" + follows="all" + height="555" + layout="topleft" + left="10" + name="objects_mapview" + top="25" + width="375" /> + <panel + name="layout_panel_1" + height="22" + width="238" + follows="right|top" + top="25" + left_pad="5" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" + follows="top|right" + halign="left" + height="16" layout="topleft" left="15" - name="maptab" - tab_position="top" - top="25" - width="542"> - <panel - filename="panel_world_map.xml" - follows="left|top|right|bottom" - height="550" - label="Objects" - layout="topleft" - left="1" - name="objects_mapview" - top="19" - width="540" /> - <panel - filename="panel_world_map.xml" - follows="left|top|right|bottom" - height="550" - label="Terrain" - layout="topleft" - left_delta="0" - name="terrain_mapview" - top_delta="3" - width="540" /> - </tab_container> + name="events_label" + top="3" + width="215"> + Legend + </text> + </panel> +<panel + follows="right|top" + height="126" + top_pad="0" + width="238" + name="layout_panel_2"> +<button + follows="right|top" + height="22" + image_overlay="map_avatar_16.tga" + scale_image="true" + left="4" + layout="topleft" + name="Show My Location" + tool_tip="Center map on my avatar's location" + top="6" + width="24" > + <button.commit_callback + function="WMap.ShowAgent" /> + </button> + <text + type="string" + length="1" + follows="top|right" + halign="left" + height="13" + top_delta="6" + left_pad="5" + layout="topleft" + name="me_label" + width="90"> + Me + </text> + <check_box + control_name="MapShowPeople" + follows="top|right" + height="16" + layout="topleft" + left="3" + name="people_chk" + top_pad="9" + width="22" /> <icon + color="0 1 0 1" + follows="top|right" + height="8" + image_name="map_avatar_8.tga" + layout="topleft" + left_pad="3" + mouse_opaque="true" + name="person" + top_delta="3" + width="8" /> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - image_name="map_avatar_16.tga" + top_delta="-2" + left_pad="7" layout="topleft" - left="-230" + name="person_label" + width="90"> + Person + </text> + <check_box + control_name="MapShowInfohubs" + follows="top|right" + height="16" + layout="topleft" + left="3" + name="infohub_chk" + top_pad="3" + width="22" /> + <icon + follows="top|right" + height="16" + image_name="map_infohub.tga" + layout="topleft" + left_pad="0" mouse_opaque="true" - name="self" - top="34" + name="infohub" + top_delta="0" width="16" /> - <text + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="you_label" - top_delta="0" - width="145"> - You + name="infohub_label" + width="90"> + Infohub </text> + <check_box + control_name="MapShowLandForSale" + follows="top|right" + height="16" + layout="topleft" + left="3" + name="land_for_sale_chk" + top_pad="2" + width="22" /> <icon follows="top|right" height="16" - image_name="map_home.tga" + image_name="icon_for_sale.tga" layout="topleft" - left_delta="50" mouse_opaque="true" - name="home" + name="landforsale" top_delta="0" + left_pad="0" width="16" /> - <text + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="home_label" - top_delta="0" - width="145"> - Home + name="land_sale_label" + width="90"> + Land Sale </text> - <icon + <icon color="0.5 0.25 1 1" follows="top|right" height="16" image_name="legend.tga" layout="topleft" - left="-230" mouse_opaque="true" name="square2" - top="54" + left="20" + top_pad="2" width="16" /> <text type="string" @@ -104,11 +195,11 @@ follows="top|right" height="16" layout="topleft" - left_pad="4" + left_pad="0" name="auction_label" - top_delta="0" - width="145"> - Auction + top_delta="3" + width="170"> + land auction </text> <icon color="1 1 0.25 1" @@ -116,10 +207,10 @@ height="16" image_name="legend.tga" layout="topleft" - left_delta="50" mouse_opaque="true" - name="square" - top_delta="0" + name="square2" + left="20" + top_pad="-5" width="16" /> <text type="string" @@ -127,286 +218,311 @@ follows="top|right" height="16" layout="topleft" - left_pad="4" - name="land_for_sale_label" - top_delta="0" - width="145"> - Land For Sale + left_pad="0" + name="by_owner_label" + top_delta="3" + width="100"> + by owner </text> + <button follows="top|right" - font="SansSerifSmall" - height="16" - label="Go Home" - label_selected="Go Home" + height="22" + image_overlay="map_home.tga" + scale_image="true" + label_color="White" layout="topleft" - left="-90" + left="136" + top="6" name="Go Home" - tool_tip="Teleport to your home" - top="34" - width="88" /> - <icon - color="0 1 0 1" + tool_tip="Teleport to my home location" + width="24" > + <button.commit_callback + function="WMap.GoHome" /> + </button> + <text + type="string" + length="1" follows="top|right" - height="8" - image_name="map_avatar_8.tga" + halign="left" + height="13" + top_delta="6" + left_pad="5" layout="topleft" - left="-226" - mouse_opaque="true" - name="person" - top="84" - width="8" /> - <check_box - control_name="MapShowPeople" + name="Home_label" + width="70"> + Home + </text> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Resident" layout="topleft" - left_pad="8" - name="people_chk" - top_delta="-4" - width="110" /> - <icon + left="137" + name="events_label" + top_pad="9" + width="66"> + Events: + </text> + + <check_box + control_name="MapShowEvents" follows="top|right" height="16" - image_name="map_infohub.tga" layout="topleft" - left="-230" - mouse_opaque="true" - name="infohub" - top="100" - width="16" /> - <check_box - control_name="MapShowInfohubs" + left="135" + top_pad="1" + name="event_chk" + width="22" /> + <icon follows="top|right" height="16" - label="Infohub" + image_name="Parcel_PG_Dark" layout="topleft" - left_pad="4" - name="infohub_chk" - top_delta="0" - width="110" /> - <icon + mouse_opaque="true" + name="event" + left_pad="0" + width="18" /> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - image_name="map_telehub.tga" + top_delta="2" + left_pad="3" layout="topleft" - left="-230" - mouse_opaque="true" - name="telehub" - top="120" - width="16" /> + name="pg_label" + width="60"> + General + </text> + <check_box - control_name="MapShowTelehubs" + control_name="ShowMatureEvents" follows="top|right" height="16" - label="Telehub" + initial_value="true" layout="topleft" - left_pad="4" - name="telehubchk" - top_delta="0" - width="110" /> + left="135" + name="events_mature_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" - image_name="icon_for_sale.tga" + image_name="Parcel_M_Dark" layout="topleft" - left="-230" mouse_opaque="true" - name="landforsale" - top="140" - width="16" /> - <check_box - control_name="MapShowLandForSale" - follows="top|right" - height="16" - label="Land for Sale" - layout="topleft" - left_pad="4" - name="land_for_sale_chk" + name="events_mature_icon" top_delta="0" - width="110" /> - <text + left_pad="0" + width="18" /> + <text type="string" length="1" follows="top|right" + halign="left" height="16" + top_delta="2" + left_pad="3" layout="topleft" - left="-104" - name="events_label" - top="80" - width="145"> - Events: + name="events_mature_label" + width="66"> + Moderate </text> - <icon - follows="top|right" - height="16" - image_name="map_event.tga" - layout="topleft" - left="-92" - mouse_opaque="true" - name="event" - top="100" - width="16" /> - <check_box - control_name="MapShowEvents" - follows="top|right" - height="16" - label="PG" - layout="topleft" - left_pad="4" - name="event_chk" - top_delta="0" - width="55" /> - <icon - follows="top|right" - height="16" - image_name="map_event_mature.tga" - layout="topleft" - left="-92" - mouse_opaque="true" - name="events_mature_icon" - top="120" - width="16" /> + <check_box - control_name="ShowMatureEvents" + control_name="ShowAdultEvents" follows="top|right" height="16" - initial_value="true" - label="Mature" layout="topleft" - left_pad="4" - name="event_mature_chk" - top_delta="0" - width="55" /> + left="135" + name="events_adult_chk" + top_pad="3" + width="22" /> <icon follows="top|right" height="16" - image_name="map_event_adult.tga" + image_name="Parcel_R_Dark" layout="topleft" - left="-92" + left_pad="0" mouse_opaque="true" name="events_adult_icon" - top="140" - width="16" /> - <check_box - control_name="ShowAdultEvents" + top_delta="0" + width="18" /> + <text + type="string" + length="1" follows="top|right" + halign="left" height="16" - label="Adult" + top_delta="2" + left_pad="3" layout="topleft" - left_pad="4" - name="event_adult_chk" - top_delta="0" - width="55" /> - <icon - color="0.5 0 0 1" + name="events_adult_label" + width="66"> + Adult + </text> +</panel> + + + <panel + follows="right|top" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2" + name="layout_panel_3"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" follows="top|right" + halign="left" height="16" - image_name="map_track_16.tga" layout="topleft" - left="-230" - mouse_opaque="true" - name="avatar_icon" - top="164" - width="16" /> + left="15" + name="find_on_map_label" + top="3" + width="215"> + Find on Map + </text> + </panel> + + <panel + follows="right|top|bottom" + height="330" + top_pad="0" + width="238" + name="layout_panel_4"> + <icon + color="0.5 0 0 1" + follows="top|right" + height="16" + image_name="map_track_16.tga" + layout="topleft" + left="3" + top="11" + mouse_opaque="true" + name="friends_icon" + width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" + height="23" label="Online Friends" layout="topleft" - left_pad="4" + top_delta="-4" + left_pad="7" max_chars="60" name="friend combo" - tool_tip="Friend to Show on Map" - top_delta="-4" - width="202"> + tool_tip="Show friends on map" + width="182"> <combo_box.item - label="Online Friends" + label="My Friends Online" + name="item1" value="None" /> + <combo_box.commit_callback + function="WMap.AvatarCombo"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="3" + top_pad="8" mouse_opaque="true" name="landmark_icon" - top="189" width="16" /> <combo_box allow_text_entry="true" follows="top|right" - height="20" - label="Landmarks" + height="23" + label="My Landmarks" layout="topleft" - left_pad="4" + top_delta="-3" + left_pad="7" max_chars="64" name="landmark combo" - tool_tip="Landmark to Show on Map" - top_delta="-4" - width="202"> + tool_tip="Landmark to show on map" + width="182"> <combo_box.item - label="Landmarks" + label="My Landmarks" + name="item1" value="None" /> + <combo_box.commit_callback + function="WMap.Landmark"/> </combo_box> - <icon + <icon color="0.5 0 0 1" follows="top|right" height="16" image_name="map_track_16.tga" layout="topleft" - left="-230" + left="3" + top_pad="7" mouse_opaque="true" - name="location_icon" - top="214" + name="region_icon" width="16" /> - <line_editor + <search_editor follows="top|right" - height="20" - label="Search by Region Name" + search_button_visible="false" + height="22" + text_readonly_color="DkGray" + label="Regions by Name" layout="topleft" - left_pad="4" + top_delta="-2" + left_pad="7" name="location" select_on_focus="true" tool_tip="Type the name of a region" - top_delta="-4" - width="140" /> - <button + width="152"> + <search_editor.commit_callback + function="WMap.Location" /> + </search_editor> + <button follows="top|right" - height="20" - label="Search" + height="23" + label="Find" layout="topleft" - left_pad="5" + left_pad="2" + top_delta="-1" name="DoSearch" tool_tip="Search for region" - top_delta="0" - width="60" /> - <text - type="string" - length="1" + width="62"> + <button.commit_callback + function="WMap.Location" /> + </button> + <button + image_overlay="Refresh_Off" follows="top|right" - font="SansSerif" - height="16" + height="23" layout="topleft" - left="-230" - name="search_label" - top="234" - width="222"> - Search Results: - </text> + left="0" + name="Clear" + tool_tip="Clear tracking lines and reset map" + top_pad="5" + width="23"> + <button.commit_callback + function="WMap.Clear" /> + </button> <scroll_list draw_stripes="false" - follows="top|right|bottom" - height="200" + bg_writeable_color="MouseGray" + follows="all" + height="145" layout="topleft" - left_delta="0" + left="28" name="search_results" - top_pad="10" - width="222"> + top_pad="-23" + width="209" + sort_column="1"> <scroll_list.columns label="" name="icon" @@ -414,127 +530,162 @@ <scroll_list.columns label="" name="sim_name" - width="206" /> + width="193" /> + <scroll_list.commit_callback + function="WMap.SearchResult" /> </scroll_list> - <text - type="string" - length="1" - follows="bottom|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="location_label" - top_pad="4" - width="98"> - Location: - </text> - <spinner - decimal_digits="0" - follows="bottom|right" - height="16" - increment="1" - initial_value="128" - layout="topleft" - left_delta="70" - max_val="255" - name="spin x" - tool_tip="X coordinate of location to show on map" - top_delta="0" - width="48" /> - <spinner - decimal_digits="0" - follows="bottom|right" - height="16" - increment="1" - initial_value="128" - layout="topleft" - left_pad="2" - max_val="255" - name="spin y" - tool_tip="Y coordinate of location to show on map" - top_delta="0" - width="48" /> - <spinner - decimal_digits="0" - follows="bottom|right" - height="16" - increment="1" - initial_value="0" - layout="topleft" - left_pad="2" - max_val="4096" - name="spin z" - tool_tip="Z coordinate of location to show on map" - top_delta="0" - width="48" /> - <button + <text + type="string" + length="1" + follows="right|bottom" + halign="right" + height="16" + layout="topleft" + left="25" + name="events_label" + top_pad="16" + width="70"> + Location: + </text> + <spinner + control_name="Teleport_Coordinate_X" + decimal_digits="0" + follows="right|bottom" + height="23" + increment="1" + initial_value="128" + layout="topleft" + left_delta="74" + max_val="255" + min_val="0" + name="teleport_coordinate_x" + width="44" > + <spinner.commit_callback + function="WMap.Coordinates" /> + </spinner> + <spinner + control_name="Teleport_Coordinate_Y" + decimal_digits="0" + follows="right|bottom" + height="23" + increment="1" + initial_value="128" + layout="topleft" + left_delta="47" + max_val="255" + min_val="0" + name="teleport_coordinate_y" > + <spinner.commit_callback + function="WMap.Coordinates" /> + </spinner> + <spinner + control_name="Teleport_Coordinate_Z" + decimal_digits="0" + follows="right|bottom" + height="23" + increment="1" + initial_value="128" + layout="topleft" + left_delta="47" + max_val="255" + min_val="0" + name="teleport_coordinate_z"> + <spinner.commit_callback + function="WMap.Coordinates" /> + </spinner> + <button follows="right|bottom" - height="20" + height="23" + image_unselected="PushButton_On" label="Teleport" - label_selected="Teleport" layout="topleft" - left="-230" + left="25" name="Teleport" tool_tip="Teleport to selected location" - top="494" - width="90" /> - <button - follows="right|bottom" - height="20" - label="Show Destination" - label_selected="Show Destination" - layout="topleft" - left_pad="10" - name="Show Destination" - tool_tip="Center map on selected location" - top_delta="0" - width="125" /> + top_pad="7" + width="104"> + <button.commit_callback + function="WMap.Teleport" /> + </button> <button follows="right|bottom" - height="20" - label="Clear" - label_selected="Clear" + height="23" + label="Copy SLurl" layout="topleft" - left="-230" - name="Clear" - tool_tip="Stop tracking" - top="518" - width="90" /> - <button - follows="right|bottom" - height="20" - label="Show My Location" - label_selected="Show My Location" - layout="topleft" - left_pad="10" - name="Show My Location" - tool_tip="Center map on your avatar's location" + left_pad="5" + name="copy_slurl" + tool_tip="Copies current location as SLurl to be used on the web." top_delta="0" - width="125" /> + width="104"> + <button.commit_callback + function="WMap.CopySLURL" /> + </button> <button enabled="false" - follows="bottom|right" - height="20" - label="Copy SLURL to clipboard" + follows="right|bottom" + height="23" + label="Show Selection" + left="25" + top_pad="5" + name="Show Destination" + tool_tip="Center map on selected location" + width="213"> + <button.commit_callback + function="WMap.ShowTarget" /> + </button> + </panel> + <panel + follows="right|bottom" + height="22" + top_pad="0" + width="238" + background_visible="true" + bg_alpha_color="DkGray2" + name="layout_panel_5"> + <text + text_color="White" + font="SansSerifLarge" + type="string" + length="1" + follows="top|right" + halign="left" + height="16" layout="topleft" - left="-230" - name="copy_slurl" - tool_tip="Copies current location as SLURL to be used on the web." - top="542" - width="222" /> + left="15" + name="zoom_label" + top="3" + width="210"> + Zoom + </text> + </panel> + <panel + follows="right|bottom" + height="30" + min_height="30" + top_pad="0" + width="238" + name="layout_panel_6"> + <icon + follows="left|bottom" + height="16" + image_name="Zoom_Off" + layout="topleft" + left="20" + mouse_opaque="true" + name="zoom_icon" + top_pad="7" + width="16" ></icon> <slider - follows="right|bottom" + follows="left|bottom" height="16" increment="0.2" - initial_value="48.5029" - label="Zoom" + initial_value="-2" + left_pad="0" layout="topleft" - left_delta="0" max_val="0" min_val="-8" name="zoom slider" show_text="false" - top_pad="8" - width="222" /> + width="200" /> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 483291044d..ebbb53729d 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -2,7 +2,7 @@ <fonts> <font name="default" comment="default font files (global fallbacks)"> - <file>DejaVuSansCondensed.ttf</file> + <file>DejaVuSans.ttf</file> <os name="Windows"> <file>MSGOTHIC.TTC</file> <file>gulim.ttc</file> @@ -18,14 +18,43 @@ </os> </font> + <font name="SansSerifBold" + comment="Name of bold sans-serif font"> + <file>DejaVuSans-Bold.ttf</file> + <os name="Windows"> + <file>arialbd.ttf</file> + </os> + <os name="Mac"> + <file>Helvetica.dfont</file> + </os> + </font> + <font name="SansSerif" comment="Name of san-serif font (Truetype file name)"> - <file>"MtBkLfRg.ttf"</file> + <file>DejaVuSans.ttf</file> + <os name="Windows"> + <file>arial.ttf</file> + </os> + <os name="Mac"> + <file>Helvetica.dfont</file> + </os> + </font> + + <font name="SansSerif" + comment="Name of bold sans-serif font" + font_style="BOLD"> + <file>DejaVuSans-Bold.ttf</file> + </font> + + <font name="SansSerif" + comment="Name of italic sans-serif font" + font_style="ITALIC"> + <file>DejaVuSans-Oblique.ttf</file> </font> - <font name="SansSerifBold" - comment="Name of bold sans-serif font" - font_style="Bold"> - <file>MtBdLfRg.ttf</file> + <font name="SansSerif" + comment="Name of bold italic sans-serif font" + font_style="BOLD|ITALIC"> + <file>DejaVuSans-BoldOblique.ttf</file> </font> <font name="Monospace" @@ -41,52 +70,77 @@ <font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD"> - <file>DejaVuSansBold.ttf</file> + <file>DejaVuSans-Bold.ttf</file> </font> <font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC"> - <file>DejaVuSansOblique.ttf</file> + <file>DejaVuSans-Oblique.ttf</file> </font> <font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC"> - <file>DejaVuSansBoldOblique.ttf</file> + <file>DejaVuSans-BoldOblique.ttf</file> </font> <font name="Helvetica" comment="Name of Helvetica font"> - <file>arial.ttf</file> + <file>DejaVuSans.ttf</file> + <os name="Windows"> + <file>arial.ttf</file> + </os> + <os name="Mac"> + <file>arial.ttf</file> + </os> </font> <font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> - <file>arialbd.ttf</file> + <file>DejaVuSans-Bold.ttf</file> + <os name="Windows"> + <file>arialbd.ttf</file> + </os> + <os name="Mac"> + <file>arialbd.ttf</file> + </os> </font> <font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC"> - <file>ariali.ttf</file> + <file>DejaVuSans-Oblique.ttf</file> + <os name="Windows"> + <file>ariali.ttf</file> + </os> + <os name="Mac"> + <file>ariali.ttf</file> + </os> </font> <font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> - <file>arialbi.ttf</file> + <file>DejaVuSans-BoldOblique.ttf</file> + <os name="Windows"> + <file>arialbi.ttf</file> + </os> + <os name="Mac"> + <file>arialbi.ttf</file> + </os> </font> <font name="OverrideTest" comment="Name of font to test overriding"> <file>times.ttf</file> + <file>DejaVuSans.ttf</file> </font> <font_size name="Monospace" comment="Size for monospaced font (points, or 1/72 of an inch)" - size="9.0" + size="8.0" /> <font_size name="Huge" comment="Size of huge font (points, or 1/72 of an inch)" @@ -94,15 +148,14 @@ /> <font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" - size="12.0" + size="10.6" /> <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" - size="10.0" + size="8.6" /> <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" - size="9" + size="7.6" /> </fonts> - diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml new file mode 100644 index 0000000000..194ae151d2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -0,0 +1,182 @@ +<?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_avatar" + single_instance="true" + sound_flags="0" + visible="true" + width="228"> + <!-- Allowed fields include: + [BORN_ON] ("12/3/2008") + [SL_PROFILE] (Second Life profile), + [RW_PROFILE] (real world profile), + [ACCTTYPE] ("Resident"), + [PAYMENTINFO] ("Payment Info on File"), + [AGE] ("1 year 2 months") + --> + <string + name="Subtitle"> +[AGE] + </string> + <string + name="Details"> +[SL_PROFILE] + </string> + <text + follows="top|left" + font="SansSerifLarge" + height="16" + left="8" + name="user_name" + top="10" + text_color="White" + use_ellipses="true" + value="Grumpity ProductEngine" + width="175" /> + <text + follows="top|left" + height="16" + left="8" + name="user_subtitle" + font="SansSerifSmall" + text_color="White" + value="11 Months, 3 days old" + width="175" + use_ellipses="true" /> + <text + follows="left|top|right" + height="35" + left="8" + name="user_details" + right="-10" + word_wrap="true" + top_pad="6" + use_ellipses="true" + width="220">This is my second life description and I really think it is great. + </text> + <slider + follows="top|left" + height="23" + increment="0.01" + left="1" + max_val="0.95" + min_val="0.05" + name="volume_slider" + show_text="false" + tool_tip="Voice volume" + top_pad="0" + value="0.5" + width="195" /> + <button + follows="top|left" + height="16" + image_disabled="Audio_Off" + image_disabled_selected="AudioMute_Off" + image_hover_selected="AudioMute_Over" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + left_pad="0" + top_delta="4" + name="mute_btn" + width="16" /> + <avatar_icon + follows="top|left" + height="38" + right="-10" + bevel_style="in" + border_style="line" + mouse_opaque="true" + name="avatar_icon" + top="10" + width="38" /> +<!-- Overlapping buttons for default actions + llinspectavatar.cpp makes visible the most likely default action +--> + <button + follows="top|left" + height="20" + label="Add Friend" + left="8" + top="119" + name="add_friend_btn" + width="90" /> + <button + follows="top|left" + height="20" + label="IM" + left_delta="0" + top_delta="0" + name="im_btn" + width="80" + commit_callback.function="InspectAvatar.IM"/> + <button + follows="top|left" + height="20" + label="Profile" + layout="topleft" + name="view_profile_btn" + left_delta="96" + top_delta="0" + tab_stop="false" + width="80" /> + <!-- gear buttons here --> + <menu_button + follows="top|left" + height="20" + layout="topleft" + image_overlay="OptionsMenu_Off" + menu_filename="menu_inspect_avatar_gear.xml" + name="gear_btn" + right="-5" + top_delta="0" + width="35" /> + <menu_button + follows="top|left" + height="20" + image_overlay="OptionsMenu_Off" + menu_filename="menu_inspect_self_gear.xml" + name="gear_self_btn" + right="-5" + top_delta="0" + width="35" /> + <panel + follows="top|left" + top="148" + left="0" + height="60" + width="228" + visible="false" + background_visible="true" + name="moderator_panel" + background_opaque="true" + bg_opaque_color="MouseGray"> + <button + name="disable_voice" + label="Disable Voice" + top="20" + width="95" + height="20" + left="10" + commit_callback.function="InspectAvatar.DisableVoice"/> + <button + name="enable_voice" + label="Enable Voice" + top="20" + width="95" + height="20" + left="10" + visible="false" + commit_callback.function="InspectAvatar.EnableVoice"/> + </panel> +</floater> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml new file mode 100644 index 0000000000..bcdb63228d --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -0,0 +1,104 @@ +<?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="158" + layout="topleft" + name="inspect_group" + single_instance="true" + sound_flags="0" + visible="true" + width="228"> + <string name="PrivateGroup">Private group</string> + <string name="FreeToJoin">Free to join</string> + <string name="CostToJoin">L$[AMOUNT] to join</string> + <string name="YouAreMember">You are a member</string> + <text + follows="all" + font="SansSerifLarge" + height="16" + left="8" + name="group_name" + top="10" + text_color="White" + use_ellipses="true" + width="175" + word_wrap="false"> + Grumpity's Grumpy Group of Moose + </text> + <text + follows="all" + font="SansSerifSmall" + text_color="White" + height="16" + left="8" + name="group_subtitle" + use_ellipses="true" + width="175"> + 123 members + </text> + <text + follows="all" + height="45" + left="8" + name="group_details" + use_ellipses="true" + top_pad="6" + width="220" + word_wrap="true"> +A group of folks charged with creating a room with a moose. +Fear the moose! Fear it! And the mongoose too! + </text> + <text + follows="all" + height="13" + left="8" + name="group_cost" + top_pad="13" + width="220"> +L$123 to join + </text> + <icon + follows="all" + height="38" + right="-10" + mouse_opaque="true" + name="group_icon" + top="10" + width="38" + bevel_style="in" /> + <button + follows="bottom|left" + height="23" + label="Join" + left="8" + top="125" + name="join_btn" + width="103" + commit_callback.function="InspectGroup.Join"/> + <button + follows="bottom|left" + height="23" + label="Leave" + left="8" + top="125" + name="leave_btn" + width="103" + commit_callback.function="InspectGroup.Leave"/> + <button + follows="bottom|left" + height="23" + label="View Profile" + name="view_profile_btn" + top="125" + left="117" + width="103" + commit_callback.function="InspectGroup.ViewProfile" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml new file mode 100644 index 0000000000..eb2e7ea788 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -0,0 +1,169 @@ +<?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="150" + layout="topleft" + name="inspect_object" + single_instance="true" + sound_flags="0" + visible="true" + width="228"> + <string name="Creator">By [CREATOR]</string> + <string name="CreatorAndOwner"> +By [CREATOR] +Owner [OWNER] + </string> + <string name="Price">L$[AMOUNT]</string> + <string name="PriceFree">Free!</string> + <string name="Touch">Touch</string> + <string name="Sit">Sit</string> + <text + parse_urls="false" + follows="all" + font="SansSerifLarge" + height="30" + left="8" + name="object_name" + text_color="White" + top="6" + use_ellipses="true" + word_wrap="true" + width="220" /> + <text + follows="all" + height="50" + left="8" + name="object_creator" + top_pad="6" + use_ellipses="true" + width="220"> + by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about + </text> + <text + follows="all" + font="SansSerifSmall" + font.style="BOLD" + height="14" + halign="right" + right="-5" + name="price_text" + text_color="white" + top="60" + font_shadow="none" + width="60"> +L$30,000 + </text> + <text + clip_partial="true" + follows="all" + font="SansSerifSmall" + height="25" + left="8" + name="object_description" + top="76" + use_ellipses="true" + width="220" + word_wrap="true"> + </text> + <!-- Overlapping buttons for all default actions. Show "Buy" if + for sale, "Sit" if can sit, etc. --> + <text + follows="all" + font="SansSerifSmall" + height="13" + name="object_media_url" + width="220" + top_pad="0" + max_length = "50" + use_ellipses="true"> + http://www.superdupertest.com +</text> + <button + follows="top|left" + height="20" + label="Buy" + left="8" + name="buy_btn" + top="121" + width="80" /> + <button + follows="top|left" + height="20" + label="Pay" + left_delta="0" + name="pay_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Take Copy" + left_delta="0" + name="take_free_copy_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Touch" + left_delta="0" + name="touch_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Sit" + left_delta="0" + name="sit_btn" + top_delta="0" + width="80" /> + <button + follows="top|left" + height="20" + label="Open" + left_delta="0" + name="open_btn" + top_delta="0" + width="80" /> + <icon + name="secure_browsing" + image_name="Lock" + left_delta="80" + visible="false" + width="18" + height="18" + top_delta="0" + tool_tip="Secure Browsing" + follows="left|top" /> + + <!-- non-overlapping buttons here --> + <button + follows="top|left" + height="20" + label="More" + layout="topleft" + name="more_info_btn" + left_delta="10" + top_delta="0" + tab_stop="false" + width="80" /> + <menu_button + follows="top|left" + height="20" + image_overlay="OptionsMenu_Off" + menu_filename="menu_inspect_object_gear.xml" + name="gear_btn" + right="-5" + top_delta="0" + width="35" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml new file mode 100644 index 0000000000..ef3dd844cd --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml @@ -0,0 +1,95 @@ +<?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="18" + bevel_style="in" + bg_opaque_image="Inspector_Background" + can_close="false" + can_minimize="false" + height="130" + layout="topleft" + name="inspect_remote_object" + single_instance="true" + sound_flags="0" + visible="true" + width="300"> + <text + follows="all" + font="SansSerifLarge" + font_style="BOLD" + height="30" + left="8" + name="object_name" + text_color="White" + top="5" + use_ellipses="true" + word_wrap="true" + width="291"> + Test Object Name That Is Really Long OMG so long I can't believe how long the name of this object is, I mean really. + </text> + <text + follows="top|left" + font="SansSerifSmall" + height="16" + left="8" + name="object_owner_label" + width="55" + top_pad="12"> + Owner: + </text> + <text + follows="top|left" + height="16" + left_pad="5" + name="object_owner" + use_ellipses="true" + width="230" + word_wrap="false"> + Longavatarname Johnsonlongstonnammer + </text> + <!--<text + follows="top|left" + height="16" + left="8" + name="object_slurl_label" + top_pad="5" + width="55"> + Location: + </text>--> + <text + follows="top|left" + height="16" + left="8" + name="object_slurl" + width="290" + use_ellipses="true" + word_wrap="false"> + http://slurl.com/Ahern/50/50/50 + </text> + <button + follows="top|left" + height="23" + label="Map" + left="8" + top_pad="8" + name="map_btn" + width="90" /> + <button + follows="top|left" + height="23" + label="Block" + left_pad="8" + name="block_btn" + width="90" /> + <button + follows="top|left" + height="23" + label="Close" + right="-8" + name="close_btn" + left_pad="5" + width="90" /> +</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/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml new file mode 100644 index 0000000000..a7ecc39ed8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml @@ -0,0 +1,9 @@ +<button + chrome="true" + image_selected="Info_Over" + image_unselected="Info_Over" + image_pressed="Info_Over" + height="12" + name="inspector_info_ctrl" + width="12" /> +
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml new file mode 100644 index 0000000000..c8a06fe401 --- /dev/null +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- This file contains strings that used to be hardcoded in the source.--> +<strings> + + <!-- Locale Information --> + <string name="MicrosoftLocale">english</string> + <string name="DarwinLocale">C</string> + <string name="LinuxLocale">C</string> + + <!-- Note: for plural nouns, see strings.xml. For example: + AgeYearsA = singular, + AgeYearsB = plural, + AgeYearsC = plural for non-English languages like Russian + For example, LLTrans::getCountString("AgeYears", 3) is plural form B + in English and form C in Russian --> + <!-- + datetimeToCodes["wkday"] = "%a"; // Thu + datetimeToCodes["weekday"] = "%A"; // Thursday + datetimeToCodes["year4"] = "%Y"; // 2009 + datetimeToCodes["year"] = "%Y"; // 2009 + datetimeToCodes["year2"] = "%y"; // 09 + datetimeToCodes["mth"] = "%b"; // Aug + datetimeToCodes["month"] = "%B"; // August + datetimeToCodes["mthnum"] = "%m"; // 08 + datetimeToCodes["day"] = "%d"; // 31 + datetimeToCodes["sday"] = "%-d"; // 9 + datetimeToCodes["hour24"] = "%H"; // 14 + datetimeToCodes["hour"] = "%H"; // 14 + datetimeToCodes["hour12"] = "%I"; // 02 + datetimeToCodes["min"] = "%M"; // 59 + datetimeToCodes["ampm"] = "%p"; // AM + datetimeToCodes["second"] = "%S"; // 59 + datetimeToCodes["timezone"] = "%Z"; // PST + --> + + <string name="TimeHour">hour,datetime,slt</string> + <string name="TimeMin">min,datetime,slt</string> + <string name="TimeYear">year,datetime,slt</string> + <string name="TimeDay">day,datetime,slt</string> + <string name="TimeMonth">mthnum,datetime,slt</string> + <string name="TimeWeek">wkday,datetime,slt</string> + <string name="TimeAMPM">ampm,datetime,slt</string> + <string name="TimeHour12">hour12,datetime,slt</string> + + <string name="LTimeMthNum">mthnum,datetime,local</string> + <string name="LTimeWeek">wkday,datetime,local</string> + <string name="LTimeMonth">mth,datetime,local</string> + <string name="LTimeDay">day,datetime,local</string> + <string name="LTimeSec">second,datetime,local</string> + <string name="LTimeHour">hour,datetime,local</string> + <string name="LTimeMin">min,datetime,local</string> + <string name="LTimeYear">year,datetime,local</string> + + <string name="UTCTimeWeek">weekday,datetime,utc</string> + <string name="UTCTimeDay">day,datetime,utc</string> + <string name="UTCTimeMth">mth,datetime,utc</string> + <string name="UTCTimeYr">year,datetime,utc</string> + <string name="UTCTimeHr">hour,datetime,utc</string> + <string name="UTCTimeMin">min,datetime,utc</string> + <string name="UTCTimeSec">second,datetime,utc</string> + <string name="UTCTimeTimezone">timezone,datetime,utc</string> +</strings> diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml new file mode 100644 index 0000000000..8d9ebf6e06 --- /dev/null +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top|bottom" + height="768" + layout="topleft" + left="0" + mouse_opaque="false" + tab_stop="false" + name="main_view" + width="1024"> + <layout_stack border_size="0" + follows="all" + mouse_opaque="false" + height="749" + name="menu_stack" + orientation="vertical" + top="19"> + <layout_panel auto_resize="false" + height="60" + mouse_opaque="false" + name="nav_bar_container" + tab_stop="false" + min_height="10" + width="1024" + user_resize="false" + visible="false"> + </layout_panel> + <layout_panel auto_resize="true" + follows="all" + height="500" + layout="topleft" + mouse_opaque="false" + tab_stop="false" + name="hud" + width="1024"> + <layout_stack border_size="0" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="hud_stack" + orientation="horizontal" + top="0" + width="1024"> + <layout_panel auto_resize="true" + follows="all" + height="500" + layout="topleft" + mouse_opaque="false" + tab_stop="false" + name="non_side_tray_view" + user_resize="false" + width="500"> + <view bottom="500" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="world_view_rect" + width="500"/> + <layout_stack border_size="0" + bottom="500" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="world_stack" + orientation="vertical"> + <layout_panel auto_resize="true" + follows="all" + height="500" + layout="topleft" + tab_stop="false" + mouse_opaque="false" + user_resize="false" + name="hud container" + width="500"> + <panel follows="left|top" + height="19" + left="0" + mouse_opaque="false" + name="topinfo_bar_container" + tab_stop="false" + top="0" + visible="false" + width="1024"/> + <panel follows="right|top|bottom" + height="500" + mouse_opaque="false" + name="side_bar_tabs" + right="500" + tab_stop="false" + top="0" + width="32"/> + <panel bottom="500" + follows="left|right|bottom" + height="25" + left="0" + mouse_opaque="false" + tab_stop="false" + name="stand_stop_flying_container" + visible="false" + width="500"/> + </layout_panel> + <layout_panel auto_resize="false" + min_height="33" + height="33" + mouse_opaque="false" + name="bottom_tray_container" + visible="false"/> + </layout_stack> + </layout_panel> + <!-- side tray --> + <layout_panel auto_resize="false" + follows="top|bottom" + height="500" + min_width="333" + mouse_opaque="false" + tab_stop="false" + name="side_tray_container" + user_resize="false" + visible="false" + width="333"/> + </layout_stack> + <panel follows="all" + height="500" + left="0" + mouse_opaque="false" + name="floater_view_holder" + tab_group="-1" + tab_stop="false" + top="0" + width="1024"> + <floater_view follows="all" + height="500" + left="0" + mouse_opaque="false" + name="Floater View" + tab_group="-1" + tab_stop="false" + top="0" + width="1024"/> + </panel> + <debug_view follows="all" + left="0" + top="0" + mouse_opaque="false" + height="500" + name="DebugView" + width="1024"/> + </layout_panel> + </layout_stack> + <panel mouse_opaque="false" + follows="left|right|top" + name="status_bar_container" + tab_stop="false" + height="19" + left="0" + top="0" + width="1024" + visible="false"/> + <view mouse_opaque="false" + follows="all" + name="menu_bar_holder" + left="0" + top="0" + width="1024" + height="768"/> + <panel top="0" + follows="all" + mouse_opaque="false" + left="0" + name="snapshot_floater_view_holder" + width="1024" + height="798"> + <snapshot_floater_view enabled="false" + follows="all" + height="768" + left="0" + mouse_opaque="false" + name="Snapshot Floater View" + tab_stop="false" + top="0" + visible="false" + width="1024"/> + </panel> + <panel top="0" + follows="all" + height="768" + mouse_opaque="false" + name="popup_holder" + class="popup_holder" + width="1024"> + <icon follows="right|bottom" + image_name="Resize_Corner" + right="-1" + name="resize_corner" + width="11" + bottom="-1" + height="11" /> + </panel> + <view top="0" + left="0" + width="1024" + height="768" + name="hint_holder" + mouse_opaque="false" + follows="all"/> + <panel top="0" + follows="all" + height="768" + mouse_opaque="true" + name="progress_view" + filename="panel_progress.xml" + class="progress_view" + width="1024" + visible="false"/> + <menu_holder top="0" + follows="all" + height="768" + mouse_opaque="false" + name="Menu Holder" + width="1024"/> + <tooltip_view top="0" + follows="all" + height="768" + mouse_opaque="false" + name="tooltip view" + tab_group="-2" + width="1024"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml new file mode 100644 index 0000000000..1925d3396f --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + name="Add Wearable Gear Menu"> + <menu_item_check + label="Sort by Most Recent" + layout="topleft" + name="sort_by_most_recent"> + <on_check + function="AddWearable.Gear.Check" + parameter="by_most_recent" /> + <on_click + function="AddWearable.Gear.Sort" + parameter="by_most_recent" /> + </menu_item_check> + <menu_item_check + label="Sort by Name" + layout="topleft" + name="sort_by_name"> + <on_check + function="AddWearable.Gear.Check" + parameter="by_name" /> + <on_click + function="AddWearable.Gear.Sort" + parameter="by_name" /> + </menu_item_check> + <menu_item_check + label="Sort by Type" + layout="topleft" + name="sort_by_type"> + <on_check + function="AddWearable.Gear.Check" + parameter="by_type" /> + <on_click + function="AddWearable.Gear.Sort" + parameter="by_type" /> + <on_visible + function="AddWearable.Gear.Visible" + parameter="by_type" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml new file mode 100644 index 0000000000..b46b62ec4d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- *NOTE: See also menu_avatar_other.xml --> +<context_menu + layout="topleft" + name="Avatar Pie"> + <menu_item_call + label="View Profile" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="hit object" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Add Friend" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableAddFriend" /> + </menu_item_call> + <menu_item_call + label="IM" + name="Send IM..."> + <menu_item_call.on_click + function="Avatar.SendIM" /> + </menu_item_call> + <menu_item_call + label="Call" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableCall" /> + </menu_item_call> + <menu_item_call + label="Invite to Group" + name="Invite..."> + <menu_item_call.on_click + function="Avatar.InviteToGroup" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + enabled="false" + label="Block" + name="Avatar Mute"> + <menu_item_call.on_click + function="Avatar.Mute" /> + <menu_item_call.on_enable + function="Avatar.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Report" + name="abuse"> + <menu_item_call.on_click + function="Avatar.ReportAbuse" /> + </menu_item_call> + <menu_item_call + label="Freeze" + name="Freeze..."> + <menu_item_call.on_click + function="Avatar.Freeze" /> + <menu_item_call.on_visible + function="Avatar.EnableFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Eject" + name="Eject..."> + <menu_item_call.on_click + function="Avatar.Eject" /> + <menu_item_call.on_visible + function="Avatar.EnableFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="Debug..."> + <menu_item_call.on_click + function="Avatar.Debug" /> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="Zoom In"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="zoom" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pay" + name="Pay..."> + <menu_item_call.on_click + function="PayObject" /> + <menu_item_call.on_enable + function="EnablePayAvatar" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Object Profile" + name="Object Inspect"> + <menu_item_call.on_click + function="Object.Inspect" /> + <menu_item_call.on_enable + function="Object.EnableInspect" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml new file mode 100644 index 0000000000..84e81397be --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Attachment Pie"> + <menu_item_call + enabled="false" + label="Touch" + layout="topleft" + name="Attachment Object Touch"> + <menu_item_call.on_click + function="Object.Touch" /> + <menu_item_call.on_enable + function="Object.EnableTouch" + name="EnableTouch"/> + </menu_item_call> + <!--menu_item_call + label="Stand Up" + layout="topleft" + name="Stand Up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call--> + <menu_item_call + enabled="false" + label="Edit" + layout="topleft" + name="Edit..."> + <menu_item_call.on_click + function="Object.Edit" /> + <menu_item_call.on_enable + function="EnableEdit" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Detach" + layout="topleft" + name="Detach"> + <menu_item_call.on_click + function="Attachment.Detach" /> + <menu_item_call.on_enable + function="Attachment.EnableDetach" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + + <menu_item_call + label="Sit Down" + layout="topleft" + name="Sit Down Here"> + <menu_item_call.on_click + function="Self.SitDown" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableSitDown" /> + </menu_item_call> + + <menu_item_call +label="Stand Up" +layout="topleft" +name="Stand Up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call> + <menu_item_call + label="Change Outfit" + name="Change Outfit"> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Outfit" +layout="topleft" +name="Edit Outfit"> + <menu_item_call.on_click + function="EditOutfit" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Shape" + layout="topleft" + name="Edit My Shape"> + <menu_item_call.on_click + function="EditShape" /> + <menu_item_call.on_enable + function="Edit.EnableEditShape" /> + </menu_item_call> + <menu_item_call + label="My Friends" + layout="topleft" + name="Friends..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + layout="topleft" + name="Groups..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_call + label="My Profile" + layout="topleft" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="Debug..."> + <menu_item_call.on_click + function="Avatar.Debug" /> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Drop" + layout="topleft" + name="Drop"> + <menu_item_call.on_click + function="Attachment.Drop" /> + <menu_item_call.on_enable + function="Attachment.EnableDrop" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index df510d68eb..50910dff32 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Show Profile..." + label="View Profile" layout="topleft" name="Show Profile"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml new file mode 100644 index 0000000000..276b5f106f --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- *NOTE: See also menu_attachment_other.xml --> +<context_menu + layout="topleft" + name="Avatar Pie"> + <menu_item_call + label="View Profile" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="hit object" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Add Friend" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableAddFriend" /> + </menu_item_call> + <menu_item_call + label="IM" + name="Send IM..."> + <menu_item_call.on_click + function="Avatar.SendIM" /> + </menu_item_call> + <menu_item_call + label="Call" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableCall" /> + </menu_item_call> + <menu_item_call + label="Invite to Group" + name="Invite..."> + <menu_item_call.on_click + function="Avatar.InviteToGroup" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + enabled="false" + label="Block" + name="Avatar Mute"> + <menu_item_call.on_click + function="Avatar.Mute" /> + <menu_item_call.on_enable + function="Avatar.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Report" + name="abuse"> + <menu_item_call.on_click + function="Avatar.ReportAbuse" /> + </menu_item_call> + <menu_item_call + label="Freeze" + name="Freeze..."> + <menu_item_call.on_click + function="Avatar.Freeze" /> + <menu_item_call.on_visible + function="Avatar.EnableFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Eject" + name="Eject..."> + <menu_item_call.on_click + function="Avatar.Eject" /> + <menu_item_call.on_visible + function="Avatar.EnableFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="Debug..."> + <menu_item_call.on_click + function="Avatar.Debug" /> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="Zoom In"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="zoom" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pay" + name="Pay..."> + <menu_item_call.on_click + function="PayObject" /> + <menu_item_call.on_enable + function="EnablePayAvatar" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml new file mode 100644 index 0000000000..2afa29ec10 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -0,0 +1,252 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Self Pie"> + <menu_item_call + label="Sit Down" + layout="topleft" + name="Sit Down Here"> + <menu_item_call.on_click + function="Self.SitDown" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableSitDown" /> + </menu_item_call> + <menu_item_call + label="Stand Up" + layout="topleft" + name="Stand Up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call> + <context_menu + label="Take Off" + layout="topleft" + name="Take Off >"> + <context_menu + label="Clothes" + layout="topleft" + name="Clothes >"> + <menu_item_call + enabled="false" + label="Shirt" + layout="topleft" + name="Shirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="shirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="shirt" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pants" + layout="topleft" + name="Pants"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="pants" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="pants" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Skirt" + layout="topleft" + name="Skirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="skirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="skirt" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Shoes" + layout="topleft" + name="Shoes"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="shoes" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="shoes" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Socks" + layout="topleft" + name="Socks"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="socks" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="socks" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Jacket" + layout="topleft" + name="Jacket"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="jacket" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="jacket" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Gloves" + layout="topleft" + name="Gloves"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="gloves" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="gloves" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Undershirt" + layout="topleft" + name="Self Undershirt"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="undershirt" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="undershirt" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Underpants" + layout="topleft" + name="Self Underpants"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="underpants" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="underpants" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Tattoo" + layout="topleft" + name="Self Tattoo"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="tattoo" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="tattoo" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Alpha" + layout="topleft" + name="Self Alpha"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="alpha" /> + <menu_item_call.on_enable + function="Edit.EnableTakeOff" + parameter="alpha" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="All Clothes" + layout="topleft" + name="All Clothes"> + <menu_item_call.on_click + function="Edit.TakeOff" + parameter="all" /> + </menu_item_call> + </context_menu> + <context_menu + label="HUD" + layout="topleft" + name="Object Detach HUD" /> + <context_menu + label="Detach" + layout="topleft" + name="Object Detach" /> + <menu_item_call + label="Detach All" + layout="topleft" + name="Detach All"> + <menu_item_call.on_click + function="Self.RemoveAllAttachments" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableRemoveAllAttachments" /> + </menu_item_call> + </context_menu> + <menu_item_call + label="Change Outfit" + layout="topleft" + name="Chenge Outfit"> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Outfit" + layout="topleft" + name="Edit Outfit"> + <menu_item_call.on_click + function="EditOutfit" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call label="Edit My Shape" + layout="topleft" + name="Edit My Shape"> + <menu_item_call.on_click + function="EditShape" /> + <menu_item_call.on_enable + function="Edit.EnableEditShape" /> + </menu_item_call> + <menu_item_call + label="My Friends" + layout="topleft" + name="Friends..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + layout="topleft" + name="Groups..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_call + label="My Profile" + layout="topleft" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="Debug..."> + <menu_item_call.on_click + function="Avatar.Debug" /> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml new file mode 100644 index 0000000000..5beafef4e4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="201" + layout="topleft" + left="100" + mouse_opaque="false" + name="hide_camera_move_controls_menu" + top="624" + visible="false" + width="128"> + <menu_item_check + label="Gesture button" + layout="topleft" + name="ShowGestureButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowGestureButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowGestureButton" /> + </menu_item_check> + <menu_item_check + label="Move button" + layout="topleft" + name="ShowMoveButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowMoveButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowMoveButton" /> + </menu_item_check> + <menu_item_check + label="View button" + layout="topleft" + name="ShowCameraButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowCameraButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowCameraButton" /> + </menu_item_check> + <menu_item_check + label="Snapshot button" + layout="topleft" + name="ShowSnapshotButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowSnapshotButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowSnapshotButton" /> + </menu_item_check> + <menu_item_check + label="Build button" + layout="topleft" + name="ShowBuildButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowBuildButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowBuildButton" /> + </menu_item_check> + <menu_item_check + label="Search button" + layout="topleft" + name="ShowSearchButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowSearchButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowSearchButton" /> + </menu_item_check> + <menu_item_check + label="Map button" + layout="topleft" + name="ShowWorldMapButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowWorldMapButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowWorldMapButton" /> + </menu_item_check> + <menu_item_check + label="Mini-Map button" + layout="topleft" + name="ShowMiniMapButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowMiniMapButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowMiniMapButton" /> + </menu_item_check> + <menu_item_separator + name="Separator" /> + <menu_item_call + label="Cut" + name="NearbyChatBar_Cut"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="cut" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_cut" /> + </menu_item_call> + <menu_item_call + label="Copy" + name="NearbyChatBar_Copy"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="copy" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + name="NearbyChatBar_Paste"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="paste" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_paste" /> + </menu_item_call> + <menu_item_call + label="Delete" + name="NearbyChatBar_Delete"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="delete" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="Select All" + name="NearbyChatBar_Select_All"> + <menu_item_call.on_click + function="NearbyChatBar.Action" + parameter="select_all" /> + <menu_item_call.on_enable + function="NearbyChatBar.EnableMenuItem" + parameter="can_select_all" /> + </menu_item_call> + +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml new file mode 100644 index 0000000000..c402100fb1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="COF Attachment"> + <menu_item_call + label="Detach" + layout="topleft" + name="detach"> + <on_click + function="Attachment.Detach" + parameter="detach"/> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml new file mode 100644 index 0000000000..f0e8461360 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="COF Body"> + <menu_item_call + label="Replace" + layout="topleft" + name="replace"> + <on_click + function="BodyPart.Replace"/> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit"> + <on_click + function="BodyPart.Edit"/> + <on_enable + function="BodyPart.OnEnable" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create New" + layout="topleft" + name="create_new" + translate="false"> + <on_click + function="BodyPart.Create"/> + <on_enable + function="BodyPart.OnEnable" + parameter="create" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml new file mode 100644 index 0000000000..206d49e8c7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="COF Clothing"> + <menu_item_call + label="Take Off" + layout="topleft" + name="take_off"> + <on_click + function="Clothing.TakeOff" /> + <on_enable + function="Clothing.OnEnable" + parameter="take_off" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit"> + <on_click + function="Clothing.Edit" /> + <on_enable + function="Clothing.OnEnable" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Replace" + layout="topleft" + name="replace"> + <on_click + function="Clothing.Replace" /> + <on_enable + function="Clothing.OnEnable" + parameter="replace" /> + </menu_item_call> + <menu_item_call + label="Create New" + layout="topleft" + name="create_new" + translate="false"> + <on_click + function="Clothing.Create"/> + <on_enable + function="Clothing.OnEnable" + parameter="create" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml new file mode 100644 index 0000000000..c2a11a64ec --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + name="Gear COF"> + <menu + label="New Clothes" + layout="topleft" + name="COF.Gear.New_Clothes" /> + <menu + label="New Body Parts" + layout="topleft" + name="COF.Geear.New_Body_Parts" /> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml new file mode 100644 index 0000000000..fab76c497c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_edit.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu create_jump_keys="true" + label="Edit" + name="Edit" + visible="false"> + <menu_item_call + label="Undo" + name="Undo" + shortcut="control|Z"> + <menu_item_call.on_click + function="Edit.Undo" /> + <menu_item_call.on_enable + function="Edit.EnableUndo" /> + </menu_item_call> + <menu_item_call + label="Redo" + name="Redo" + shortcut="control|Y"> + <menu_item_call.on_click + function="Edit.Redo" /> + <menu_item_call.on_enable + function="Edit.EnableRedo" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Cut" + name="Cut" + shortcut="control|X"> + <menu_item_call.on_click + function="Edit.Cut" /> + <menu_item_call.on_enable + function="Edit.EnableCut" /> + </menu_item_call> + <menu_item_call + label="Copy" + name="Copy" + shortcut="control|C"> + <menu_item_call.on_click + function="Edit.Copy" /> + <menu_item_call.on_enable + function="Edit.EnableCopy" /> + </menu_item_call> + <menu_item_call + label="Paste" + name="Paste" + shortcut="control|V"> + <menu_item_call.on_click + function="Edit.Paste" /> + <menu_item_call.on_enable + function="Edit.EnablePaste" /> + </menu_item_call> + <menu_item_call + label="Delete" + name="Delete" + allow_key_repeat="true" + shortcut="Del"> + <menu_item_call.on_click + function="Edit.Delete" /> + <menu_item_call.on_enable + function="Edit.EnableDelete" /> + </menu_item_call> + <menu_item_call + label="Duplicate" + name="Duplicate" + shortcut="control|D"> + <menu_item_call.on_click + function="Edit.Duplicate" /> + <menu_item_call.on_enable + function="Edit.EnableDuplicate" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Select All" + name="Select All" + shortcut="control|A"> + <menu_item_call.on_click + function="Edit.SelectAll" /> + <menu_item_call.on_enable + function="Edit.EnableSelectAll" /> + </menu_item_call> + <menu_item_call + label="Deselect" + name="Deselect" + shortcut="control|E"> + <menu_item_call.on_click + function="Edit.Deselect" /> + <menu_item_call.on_enable + function="Edit.EnableDeselect" /> + </menu_item_call> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml index 7e4bbe3c9d..be380e11e5 100644 --- a/indra/newview/skins/default/xui/en/menu_favorites.xml +++ b/indra/newview/skins/default/xui/en/menu_favorites.xml @@ -7,27 +7,62 @@ <menu_item_call label="Teleport" layout="topleft" - name="Landmark Open"> + name="Teleport To Landmark"> <menu_item_call.on_click function="Favorites.DoToSelected" parameter="open" /> </menu_item_call> <menu_item_call - label="About Landmark" + label="View/Edit Landmark" layout="topleft" - name="Teleport To Landmark"> + name="Landmark Open"> <menu_item_call.on_click function="Favorites.DoToSelected" parameter="about" /> </menu_item_call> -<!-- <menu_item_call --> -<!-- label="Rename" --> -<!-- layout="topleft" --> -<!-- name="Rename"> --> -<!-- <menu_item_call.on_click --> -<!-- function="Favorites.DoToSelected" --> -<!-- parameter="rename" /> --> -<!-- </menu_item_call> --> + <menu_item_call + label="Copy SLurl" + layout="topleft" + name="Copy slurl"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="copy_slurl" /> + </menu_item_call> + <menu_item_call + label="Show on Map" + layout="topleft" + name="Show On Map"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="show_on_map" /> + </menu_item_call> + + <menu_item_separator + layout="topleft" /> + + <menu_item_call + label="Copy" + layout="topleft" + name="Landmark Copy"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="Landmark Paste"> + <menu_item_call.on_click + function="Favorites.DoToSelected" + parameter="paste" /> + <menu_item_call.on_enable + function="Favorites.EnableSelected" + parameter="can_paste" /> + </menu_item_call> + + <menu_item_separator + layout="topleft" /> + <menu_item_call label="Delete" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml new file mode 100644 index 0000000000..649f0edff7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + mouse_opaque="false" + name="menu_gesture_gear" + visible="false"> + <menu_item_call + font="SansSerifBold" + label="Add/Remove from Favorites" + layout="topleft" + name="activate"> + <on_click + function="Gesture.Action.ToogleActiveState" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="copy_gesture"> + <on_click + function="Gesture.Action.CopyPaste" + parameter="copy_gesture" /> + <on_enable + function="Gesture.EnableAction" + parameter="copy_gesture" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Gesture.Action.CopyPaste" + parameter="paste" /> + <on_enable + function="Gesture.EnableAction" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Copy UUID" + layout="topleft" + name="copy_uuid"> + <on_click + function="Gesture.Action.CopyPaste" + parameter="copy_uuid" /> + <on_enable + function="Gesture.EnableAction" + parameter="copy_uuid" /> + </menu_item_call> + <menu_item_call + label="Save to current outfit" + layout="topleft" + name="save_to_outfit"> + <on_click + function="Gesture.Action.SaveToCOF" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit_gesture"> + <on_click + function="Gesture.Action.ShowPreview" /> + <on_enable + function="Gesture.EnableAction" + parameter="edit_gesture" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml index 2029b19c1c..fce7414d80 100644 --- a/indra/newview/skins/default/xui/en/menu_group_plus.xml +++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu name="menu_group_plus" left="0" bottom="0" visible="false" - mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + mouse_opaque="false"> <menu_item_call name="item_join" label="Join Group..."> <menu_item_call.on_click function="People.Group.Plus.Action" userdata="join_group" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml new file mode 100644 index 0000000000..3f38d734b9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="201" + layout="topleft" + left="100" + mouse_opaque="false" + name="hide_navbar_menu" + top="624" + visible="false" + width="128"> + <menu_item_check + label="Show Navigation Bar" + layout="topleft" + name="ShowNavbarNavigationPanel"> + <on_click + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> + <on_check + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> + </menu_item_check> + <menu_item_check + label="Show Favorites Bar" + layout="topleft" + name="ShowNavbarFavoritesPanel"> + <on_click + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> + <on_check + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> + </menu_item_check> + <menu_item_check + label="Show Mini-Location Bar" + layout="topleft" + name="ShowMiniLocationPanel"> + <on_click + function="ToggleControl" + parameter="ShowMiniLocationPanel" /> + <on_check + function="CheckControl" + parameter="ShowMiniLocationPanel" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml new file mode 100644 index 0000000000..f8dfba91ff --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_im_well_button.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="IM Well Button Context Menu"> + <menu_item_call + label="Close All" + layout="topleft" + name="Close All"> + <menu_item_call.on_click + function="IMWellChicletMenu.Action" + parameter="close all" /> + <menu_item_call.on_enable + function="IMWellChicletMenu.EnableItem" + parameter="can close all" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml new file mode 100644 index 0000000000..eb5e31b57d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet AdHoc Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="End Session" + layout="topleft" + name="End Session"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml new file mode 100644 index 0000000000..8cbe62cfb0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet Group Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Group Info" + layout="topleft" + name="Show Profile"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="info" /> + </menu_item_call> + <menu_item_call + label="Show Session" + layout="topleft" + name="Chat"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="group chat" /> + </menu_item_call> + <menu_item_call + label="End Session" + layout="topleft" + name="End Session"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml new file mode 100644 index 0000000000..038b8328cb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="IMChiclet P2P Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="View Profile" + layout="topleft" + name="Show Profile"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="add" /> + </menu_item_call> + <menu_item_call + label="Show Session" + layout="topleft" + name="Send IM"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="im" /> + </menu_item_call> + <menu_item_call + label="End Session" + layout="topleft" + name="End Session"> + <menu_item_call.on_click + function="IMChicletMenu.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml new file mode 100644 index 0000000000..334decdf58 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="View Profile" + enabled="true" + name="view_profile"> + <menu_item_call.on_click + function="InspectAvatar.ViewProfile"/> + </menu_item_call> + <menu_item_call + label="Add Friend" + name="add_friend"> + <menu_item_call.on_click + function="InspectAvatar.AddFriend"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.Enable"/> + </menu_item_call> + <menu_item_call + label="IM" + name="im"> + <menu_item_call.on_click + function="InspectAvatar.IM"/> + </menu_item_call> + <menu_item_call + label="Call" + enabled="true" + name="call"> + <menu_item_call.on_click + function="InspectAvatar.Call"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.EnableCall"/> + </menu_item_call> + <menu_item_call + label="Teleport" + name="teleport"> + <menu_item_call.on_click + function="InspectAvatar.Teleport"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.EnableTeleportOffer"/> + </menu_item_call> + <menu_item_call + label="Invite to Group" + name="invite_to_group"> + <menu_item_call.on_click + function="InspectAvatar.InviteToGroup"/> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Block" + name="block"> + <menu_item_call.on_click + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Unblock" + name="unblock"> + <menu_item_call.on_click + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableUnmute" /> + </menu_item_call> + <menu_item_call + label="Report" + name="report"> + <menu_item_call.on_click + function="InspectAvatar.Report"/> + </menu_item_call> + <menu_item_call + label="Freeze" + name="freeze"> + <menu_item_call.on_click + function="InspectAvatar.Freeze"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Eject" + name="eject"> + <menu_item_call.on_click + function="InspectAvatar.Eject"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFreezeEject"/> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="debug"> + <menu_item_call.on_click + function="Avatar.Debug"/> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_call + label="Find On Map" + name="find_on_map"> + <menu_item_call.on_click + function="InspectAvatar.FindOnMap"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFindOnMap"/> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="zoom_in"> + <menu_item_call.on_click + function="InspectAvatar.ZoomIn"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleZoomIn"/> + </menu_item_call> + <menu_item_call + label="Pay" + name="pay"> + <menu_item_call.on_click + function="InspectAvatar.Pay"/> + </menu_item_call> + <menu_item_call + label="Share" + name="share"> + <menu_item_call.on_click + function="InspectAvatar.Share"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml new file mode 100644 index 0000000000..76f68c6d4b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="Touch" + layout="topleft" + enabled="true" + name="touch"> + <menu_item_call.on_click + function="InspectObject.Touch"/> + <menu_item_call.on_visible + function="Object.EnableTouch" /> + </menu_item_call> + <menu_item_call + label="Sit" + layout="topleft" + name="sit"> + <menu_item_call.on_click + function="InspectObject.Sit"/> + <menu_item_call.on_visible + function="Object.EnableSit"/> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="InspectObject.Pay"/> + <menu_item_call.on_visible + function="EnablePayObject" /> + </menu_item_call> + <menu_item_call + label="Buy" + layout="topleft" + enabled="true" + name="buy"> + <menu_item_call.on_click + function="InspectObject.Buy"/> + <menu_item_call.on_visible + function="Object.VisibleBuy" /> + </menu_item_call> + <menu_item_call + label="Take" + layout="topleft" + name="take"> + <menu_item_call.on_click + function="Object.Take" /> + <menu_item_call.on_enable + function="Object.VisibleTake"/> + </menu_item_call> + <menu_item_call + label="Take Copy" + layout="topleft" + name="take_copy"> + <menu_item_call.on_click + function="InspectObject.TakeFreeCopy"/> + <menu_item_call.on_visible + function="Tools.EnableTakeCopy"/> + </menu_item_call> + <menu_item_call + label="Open" + layout="topleft" + name="open"> + <menu_item_call.on_click + function="InspectObject.Open"/> + <menu_item_call.on_visible + function="Object.EnableOpen" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit"> + <menu_item_call.on_click + function="Object.Edit" /> + <menu_item_call.on_enable + function="EnableEdit"/> + </menu_item_call> + <menu_item_call + label="Wear" + layout="topleft" + name="wear"> + <menu_item_call.on_click + function="Object.AttachToAvatar" /> + <menu_item_call.on_visible + function="Object.EnableWear" /> + </menu_item_call> + <menu_item_call + label="Add" + layout="topleft" + name="add"> + <menu_item_call.on_click + function="Object.AttachAddToAvatar" /> + <menu_item_call.on_visible + function="Object.EnableWear" /> + </menu_item_call> + <menu_item_call + label="Report" + layout="topleft" + name="report"> + <menu_item_call.on_click + function="Object.ReportAbuse" /> + </menu_item_call> + <menu_item_call + label="Block" + layout="topleft" + name="block"> + <menu_item_call.on_click + function="Object.Mute" /> + <menu_item_call.on_visible + function="Object.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Zoom In" + layout="topleft" + name="zoom_in"> + <menu_item_call.on_click + function="InspectObject.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Remove" + layout="topleft" + name="remove"> + <menu_item_call.on_click + function="Object.Delete" /> + <menu_item_call.on_visible + function="Object.EnableDelete" /> + </menu_item_call> + <menu_item_call + label="More Info" + layout="topleft" + name="more_info"> + <menu_item_call.on_click + function="InspectObject.MoreInfo"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml new file mode 100644 index 0000000000..30c2cde552 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="Sit Down" + enabled="true" + name="sit_down_here"> + <menu_item_call.on_click + function="Self.SitDown" + parameter="" /> + <menu_item_call.on_visible + function="Self.EnableSitDown" /> + </menu_item_call> + <menu_item_call + label="Stand Up" + enabled="true" + name="stand_up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_visible + function="Self.EnableStandUp" /> + </menu_item_call> + <menu_item_call + label="Change Outfit" + name="change_outfit"> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call + label="My Profile" + enabled="true" + name="my_profile"> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> + <menu_item_call + label="My Friends" + name="my_friends"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + name="my_groups"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="Debug..."> + <menu_item_call.on_click + function="Avatar.Debug" /> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml new file mode 100644 index 0000000000..45a0a6635b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="InvOfferChiclet Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Close" + layout="topleft" + name="Close"> + <menu_item_call.on_click + function="InvOfferChiclet.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 808618ba96..c0046d8e28 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -5,6 +5,14 @@ name="Popup" visible="false"> <menu_item_call + label="Share" + layout="topleft" + name="Share" + visible="true"> + <menu_item_call.on_click + function="Inventory.Share" /> + </menu_item_call> + <menu_item_call label="Buy" layout="topleft" name="Task Buy"> @@ -85,7 +93,7 @@ parameter="lsl" /> </menu_item_call> <menu_item_call - label="New Note" + label="New Notecard" layout="topleft" name="New Note"> <menu_item_call.on_click @@ -230,6 +238,91 @@ parameter="eyes" /> </menu_item_call> </menu> + <menu + label="Change Type" + layout="topleft" + name="Change Type"> + <menu_item_call + label="Default" + layout="topleft" + name="Default"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_default" /> + </menu_item_call> + <menu_item_call + label="Gloves" + layout="topleft" + name="Gloves"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_gloves" /> + </menu_item_call> + <menu_item_call + label="Jacket" + layout="topleft" + name="Jacket"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_jacket" /> + </menu_item_call> + <menu_item_call + label="Pants" + layout="topleft" + name="Pants"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_pants" /> + </menu_item_call> + <menu_item_call + label="Shape" + layout="topleft" + name="Shape"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shape" /> + </menu_item_call> + <menu_item_call + label="Shoes" + layout="topleft" + name="Shoes"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shoes" /> + </menu_item_call> + <menu_item_call + label="Shirt" + layout="topleft" + name="Shirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_shirt" /> + </menu_item_call> + <menu_item_call + label="Skirt" + layout="topleft" + name="Skirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_skirt" /> + </menu_item_call> + <menu_item_call + label="Underpants" + layout="topleft" + name="Underpants"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_underpants" /> + </menu_item_call> + <menu_item_call + label="Undershirt" + layout="topleft" + name="Undershirt"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="change_folder_type_undershirt" /> + </menu_item_call> + </menu> <menu_item_call label="Teleport" layout="topleft" @@ -254,6 +347,44 @@ function="Inventory.DoToSelected" parameter="open" /> </menu_item_call> + <menu_item_separator + layout="topleft" + name="Folder Wearables Separator" /> + <menu_item_call + label="Replace Current Outfit" + layout="topleft" + name="Replace Outfit"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="replaceoutfit" /> + </menu_item_call> + <menu_item_call + label="Add To Current Outfit" + layout="topleft" + name="Add To Outfit"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="addtooutfit" /> + </menu_item_call> + <menu_item_call + label="Remove From Current Outfit" + layout="topleft" + name="Remove From Outfit"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="removefromoutfit" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Outfit Separator" /> + <menu_item_call + label="Find Original" + layout="topleft" + name="Find Original"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="goto" /> + </menu_item_call> <menu_item_call label="Purge Item" layout="topleft" @@ -279,6 +410,14 @@ parameter="open" /> </menu_item_call> <menu_item_call + label="Open Original" + layout="topleft" + name="Open Original"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="open_original" /> + </menu_item_call> + <menu_item_call label="Properties" layout="topleft" name="Properties"> @@ -303,7 +442,8 @@ parameter="copy_uuid" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Copy Separator" /> <menu_item_call label="Copy" layout="topleft" @@ -320,44 +460,45 @@ function="Inventory.DoToSelected" parameter="paste" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> <menu_item_call - label="Delete" + label="Paste As Link" layout="topleft" - name="Delete"> + name="Paste As Link"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="delete" /> + parameter="paste_link" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Paste Separator" /> <menu_item_call - label="Take Off Items" + label="Delete" layout="topleft" - name="Take Off Items"> + name="Remove Link"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="removefromoutfit" /> + parameter="delete" /> </menu_item_call> <menu_item_call - label="Add To Outfit" + label="Delete" layout="topleft" - name="Add To Outfit"> + name="Delete"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="addtooutfit" /> + parameter="delete" /> </menu_item_call> <menu_item_call - label="Replace Outfit" + label="Delete System Folder" layout="topleft" - name="Replace Outfit"> + name="Delete System Folder"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="replaceoutfit" /> + parameter="delete_system_folder" /> </menu_item_call> <menu_item_separator layout="topleft" /> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Start Conference Chat" layout="topleft" @@ -377,19 +518,21 @@ parameter="open" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Landmark Separator" /> <menu_item_call label="About Landmark" layout="topleft" - name="Teleport To Landmark"> + name="About Landmark"> <menu_item_call.on_click function="Inventory.DoToSelected" parameter="about" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Animation Separator" /> <menu_item_call - label="Play in World" + label="Play Inworld" layout="topleft" name="Animation Play"> <menu_item_call.on_click @@ -405,7 +548,8 @@ parameter="playlocal" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Send Instant Message Separator" /> <menu_item_call label="Send Instant Message" layout="topleft" @@ -431,7 +575,8 @@ parameter="selected" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Gesture Separator" /> <menu_item_call label="Activate" layout="topleft" @@ -449,7 +594,19 @@ parameter="deactivate" /> </menu_item_call> <menu_item_separator - layout="topleft" /> + layout="topleft" + name="Texture Separator" /> + <menu_item_call + label="Save As" + layout="topleft" + name="Save As"> + <menu_item_call.on_click + function="Inventory.DoToSelected" + parameter="save_as" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Wearable And Object Separator"/> <menu_item_call label="Detach From Yourself" layout="topleft" @@ -472,10 +629,10 @@ <menu_item_call label="Wear" layout="topleft" - name="Object Wear"> + name="Wearable And Object Wear"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="attach" /> + parameter="wear" /> </menu_item_call> <menu label="Attach To" @@ -494,12 +651,12 @@ parameter="edit" /> </menu_item_call> <menu_item_call - label="Wear" + label="Add" layout="topleft" - name="Wearable Wear"> + name="Wearable Add"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="wear" /> + parameter="wear_add" /> </menu_item_call> <menu_item_call label="Take Off" diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml new file mode 100644 index 0000000000..ae98abf4fb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -0,0 +1,234 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_inventory_add" + visible="false"> + <menu + create_jump_keys="true" + label="Upload" + layout="topleft" + name="upload" + tear_off="true"> + <menu_item_call + label="Image (L$[COST])..." + layout="topleft" + name="Upload Image" + shortcut="control|U"> + <menu_item_call.on_click + function="File.UploadImage" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Sound (L$[COST])..." + layout="topleft" + name="Upload Sound"> + <menu_item_call.on_click + function="File.UploadSound" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Animation (L$[COST])..." + layout="topleft" + name="Upload Animation"> + <menu_item_call.on_click + function="File.UploadAnim" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Bulk (L$[COST] per file)..." + layout="topleft" + name="Bulk Upload"> + <menu_item_call.on_click + function="File.UploadBulk" + parameter="" /> + </menu_item_call> + <menu_item_call + label="Set Default Upload Permissions" + name="perm prefs"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="perm_prefs" /> + </menu_item_call> + </menu> + + <menu_item_call + label="New Folder" + layout="topleft" + name="New Folder"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="category" /> + </menu_item_call> + <menu_item_call + label="New Script" + layout="topleft" + name="New Script"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="lsl" /> + </menu_item_call> + <menu_item_call + label="New Notecard" + layout="topleft" + name="New Note"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="notecard" /> + </menu_item_call> + <menu_item_call + label="New Gesture" + layout="topleft" + name="New Gesture"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="gesture" /> + </menu_item_call> + <menu + height="175" + label="New Clothes" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Clothes" + top_pad="514" + width="125"> + <menu_item_call + label="New Shirt" + layout="topleft" + name="New Shirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shirt" /> + </menu_item_call> + <menu_item_call + label="New Pants" + layout="topleft" + name="New Pants"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="pants" /> + </menu_item_call> + <menu_item_call + label="New Shoes" + layout="topleft" + name="New Shoes"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shoes" /> + </menu_item_call> + <menu_item_call + label="New Socks" + layout="topleft" + name="New Socks"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="socks" /> + </menu_item_call> + <menu_item_call + label="New Jacket" + layout="topleft" + name="New Jacket"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="jacket" /> + </menu_item_call> + <menu_item_call + label="New Skirt" + layout="topleft" + name="New Skirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="skirt" /> + </menu_item_call> + <menu_item_call + label="New Gloves" + layout="topleft" + name="New Gloves"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="gloves" /> + </menu_item_call> + <menu_item_call + label="New Undershirt" + layout="topleft" + name="New Undershirt"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="undershirt" /> + </menu_item_call> + <menu_item_call + label="New Underpants" + layout="topleft" + name="New Underpants"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="underpants" /> + </menu_item_call> + <menu_item_call + label="New Alpha" + layout="topleft" + name="New Alpha"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="alpha" /> + </menu_item_call> + <menu_item_call + label="New Tattoo" + layout="topleft" + name="New Tattoo"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="tattoo" /> + </menu_item_call> + </menu> + <menu + height="85" + label="New Body Parts" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Body Parts" + top_pad="514" + width="118"> + <menu_item_call + label="New Shape" + layout="topleft" + name="New Shape"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="shape" /> + </menu_item_call> + <menu_item_call + label="New Skin" + layout="topleft" + name="New Skin"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="skin" /> + </menu_item_call> + <menu_item_call + label="New Hair" + layout="topleft" + name="New Hair"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="hair" /> + </menu_item_call> + <menu_item_call + label="New Eyes" + layout="topleft" + name="New Eyes"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="eyes" /> + </menu_item_call> + </menu> +</menu>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml new file mode 100644 index 0000000000..c394700081 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_gear_default" + visible="false"> + <menu_item_call + label="New Inventory Window" + layout="topleft" + name="new_window"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="new_window" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Sort by Name" + layout="topleft" + name="sort_by_name"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="sort_by_name" /> + </menu_item_call> + <menu_item_call + label="Sort by Most Recent" + layout="topleft" + name="sort_by_recent"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="sort_by_recent" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show Filters" + layout="topleft" + name="show_filters"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="show_filters" /> + </menu_item_call> + <menu_item_call + label="Reset Filters" + layout="topleft" + name="reset_filters"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="reset_filters" /> + </menu_item_call> + <menu_item_call + label="Close All Folders" + layout="topleft" + name="close_folders"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="close_folders" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Empty Lost and Found" + layout="topleft" + name="empty_lostnfound"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="empty_lostnfound" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Save Texture As" + layout="topleft" + name="Save Texture As"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="save_texture" /> + <on_enable + function="Inventory.GearDefault.Enable" + parameter="save_texture" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share" + visible="true"> + <on_click + function="Inventory.Share" /> + <on_enable + function="Inventory.GearDefault.Enable" + parameter="share" /> + </menu_item_call> + <menu_item_call + label="Find Original" + layout="topleft" + name="Find Original"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="find_original" /> + <on_enable + function="Inventory.GearDefault.Enable" + parameter="find_original" /> + </menu_item_call> + <menu_item_call + label="Find All Links" + layout="topleft" + name="Find All Links"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="find_links" /> + <on_enable + function="Inventory.GearDefault.Enable" + parameter="find_links" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + + <menu_item_call + label="Empty Trash" + layout="topleft" + name="empty_trash"> + <on_click + function="Inventory.GearDefault.Custom.Action" + parameter="empty_trash" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml new file mode 100644 index 0000000000..cc6d8ad9c1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_land.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Land Pie"> + <menu_item_call + label="About Land" + name="Place Information..."> + <menu_item_call.on_click + function="Floater.Show" + parameter="about_land" /> + </menu_item_call> + <!-- <menu_item_call + label="Go Here" + name="Go Here"> + <menu_item_call.on_click + function="GoToObject" /> + </menu_item_call>--> + <menu_item_call + label="Sit Here" + name="Sit Here"> + <menu_item_call.on_click + function="Land.Sit" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Buy This Land" + name="Land Buy"> + <menu_item_call.on_click + function="Land.Buy" /> + <menu_item_call.on_enable + function="World.EnableBuyLand" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Buy Pass" + name="Land Buy Pass"> + <menu_item_call.on_click + function="Land.BuyPass" /> + <menu_item_call.on_enable + function="Land.EnableBuyPass" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Build" + name="Create"> + <menu_item_call.on_click + function="Land.Build" /> + <menu_item_call.on_enable + function="EnableEdit" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Edit Terrain" + name="Edit Terrain"> + <menu_item_call.on_click + function="Land.Edit" /> + <menu_item_call.on_enable + function="EnableEdit" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml new file mode 100644 index 0000000000..93b6db222a --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="201" + layout="topleft" + mouse_opaque="false" + name="landmark_overflow_menu" + width="128"> + <menu_item_call + label="Copy SLurl" + layout="topleft" + name="copy"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="delete"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="delete" /> + </menu_item_call> + <menu_item_call + label="Create Pick" + layout="topleft" + name="pick"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="pick" /> + <menu_item_call.on_enable + function="Places.OverflowMenu.Enable" + parameter="can_create_pick" /> + </menu_item_call> + <menu_item_call + label="Add to Favorites Bar" + layout="topleft" + name="add_to_favbar"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="add_to_favbar" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index eb3dcc225e..4f982cc8e9 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu_bar - follows="left|top|right" + follows="left|top" height="18" layout="topleft" left_delta="0" @@ -9,65 +9,68 @@ width="802"> <menu create_jump_keys="true" - label="File" - layout="topleft" + label="Me" + tear_off="true" name="File"> <menu_item_call - label="Quit" - layout="topleft" - name="Quit" - shortcut="control|Q"> - <menu_item_call.on_click - function="File.Quit" /> - </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="Edit" - layout="topleft" - name="Edit" - width="153"> - <menu_item_call - label="Preferences..." - layout="topleft" + label="Preferences" name="Preferences..." shortcut="control|P"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="preferences" /> </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Exit [APP_NAME]" + name="Quit" + shortcut="control|Q"> + <menu_item_call.on_click + function="File.Quit" /> + </menu_item_call> </menu> <menu create_jump_keys="true" label="Help" - layout="topleft" + tear_off="true" name="Help"> <menu_item_call - label="Second Life Help" - layout="topleft" + label="[SECOND_LIFE] Help" name="Second Life Help" shortcut="F1"> <menu_item_call.on_click - function="ShowFloater" - parameter="help f1" /> + function="ShowHelp" + parameter="f1_help" /> </menu_item_call> + <menu_item_separator /> <menu_item_call - label="About Second Life..." - layout="topleft" - name="About Second Life..."> + label="About [APP_NAME]" + name="About Second Life"> <menu_item_call.on_click - function="ShowFloater" - parameter="about" /> + function="Floater.Show" + parameter="sl_about" /> </menu_item_call> </menu> + <menu_item_check + label="Show Debug Menu" + name="Show Debug Menu" + visible="false" + shortcut="control|alt|D"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> <menu create_jump_keys="true" + visible="false" label="Debug" - layout="topleft" - name="Debug"> - <menu_item_call - label="Debug Settings" - layout="topleft" + name="Debug" + tear_off="true"> + <menu_item_call + label="Show Debug Settings" name="Debug Settings"> <menu_item_call.on_click function="Advanced.ShowDebugSettings" @@ -75,31 +78,131 @@ </menu_item_call> <menu_item_call label="UI/Color Settings" - layout="topleft" name="UI/Color Settings"> <menu_item_call.on_click function="Advanced.ShowDebugSettings" parameter="skin" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_separator /> <menu_item_call - label="UI Preview Tool" - layout="topleft" + label="XUI Preview Tool" name="UI Preview Tool" shortcut="control|T"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Toggle" parameter="ui_preview" /> </menu_item_call> + <menu_item_separator /> + <!-- Broken + <menu_item_call + label="Show Side Tray" + name="Show Side Tray"> + <menu_item_call.on_click + function="Advanced.ShowSideTray" /> + </menu_item_call> + --> + <menu + create_jump_keys="true" + label="UI Tests" + name="UI Tests" + tear_off="true"> + <menu_item_call + label="Textbox" + name="Textbox" + translate="false" + shortcut="control|1"> + <menu_item_call.on_click + function="Floater.Show" + parameter="test_textbox" /> + </menu_item_call> <menu_item_call - label="Widget Test" - layout="topleft" - name="Widget Test" + label="Text Editor" + name="Text Editor" + translate="false" + shortcut="control|2"> + <menu_item_call.on_click + function="Floater.Show" + parameter="test_text_editor" /> + </menu_item_call> + <menu_item_call + label="Widgets" + name="Widgets" + translate="false" shortcut="control|shift|T"> + <menu_item_call.on_click + function="Floater.Show" + parameter="test_widgets" /> + </menu_item_call> + <menu_item_call + label="Inspectors" + translate="false" + name="Inspectors"> + <menu_item_call.on_click + function="Floater.Show" + parameter="test_inspectors" /> + </menu_item_call> + </menu> +<!-- + <menu_item_check + label="Reg In Client Test (restart)" + name="Reg In Client Test (restart)"> + <menu_item_check.on_check + control="RegInClient" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RegInClient" /> + </menu_item_check> +--> + <menu_item_separator /> + <menu_item_call + label="Set Window Size..." + name="Set Window Size..."> + <menu_item_call.on_click + function="Floater.Show" + parameter="window_size" /> + </menu_item_call> + <menu_item_call + label="Show TOS" + name="TOS"> <menu_item_call.on_click - function="ShowFloater" - parameter="test_widgets" /> + function="Floater.Show" + parameter="message_tos" /> + </menu_item_call> + <menu_item_call + label="Show Critical Message" + name="Critical"> + <menu_item_call.on_click + function="Floater.Show" + parameter="message_critical" /> + </menu_item_call> + <menu_item_call + label="Web Browser Test" + name="Web Browser Test"> + <menu_item_call.on_click + function="Advanced.WebBrowserTest" + parameter="http://join.secondlife.com/"/> </menu_item_call> + <menu_item_separator/> + <menu_item_check + label="Show Grid Picker" + name="Show Grid Picker" + visible="false" + shortcut="control|shift|G"> + <on_check + function="CheckControl" + parameter="ForceShowGrid" /> + <on_click + function="ToggleControl" + parameter="ForceShowGrid" /> + </menu_item_check> + <menu_item_call + label="Show Notifications Console" + name="Show Notifications Console" + visible="false" + shortcut="control|shift|5"> + <on_click + function="Floater.Toggle" + parameter="notifications_console" /> + </menu_item_call> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml index a5e1f35142..8fe89d3934 100644 --- a/indra/newview/skins/default/xui/en/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml @@ -4,53 +4,64 @@ layout="topleft" left="100" mouse_opaque="false" - name="popup" + name="Popup" top="724" + visible="false" width="128"> <menu_item_call label="Zoom Close" - layout="topleft" name="Zoom Close"> <menu_item_call.on_click - function="MiniMap.ZoomLevel" - parameter="2" /> + function="Minimap.Zoom" + parameter="close" /> </menu_item_call> <menu_item_call label="Zoom Medium" - layout="topleft" name="Zoom Medium"> <menu_item_call.on_click - function="MiniMap.ZoomLevel" - parameter="1" /> + function="Minimap.Zoom" + parameter="medium" /> </menu_item_call> <menu_item_call label="Zoom Far" - layout="topleft" name="Zoom Far"> <menu_item_call.on_click - function="MiniMap.ZoomLevel" - parameter="0" /> + function="Minimap.Zoom" + parameter="far" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_separator /> + <menu_item_check + label="Rotate Map" + name="Rotate Map"> + <menu_item_check.on_check + control="MiniMapRotate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapRotate" /> + </menu_item_check> + <menu_item_check + label="Auto Center" + name="Auto Center"> + <menu_item_check.on_check + control="MiniMapAutoCenter" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MiniMapAutoCenter" /> + </menu_item_check> + <menu_item_separator /> <menu_item_call - enabled="false" label="Stop Tracking" - layout="topleft" name="Stop Tracking"> <menu_item_call.on_click - function="MiniMap.StopTracking" /> - <menu_item_call.on_enable - function="MiniMap.EnableTracking" /> + function="Minimap.Tracker" + parameter="task_properties" /> </menu_item_call> + <menu_item_separator /> <menu_item_call - enabled="false" - label="Profile..." - layout="topleft" - name="Profile"> + label="World Map" + name="World Map"> <menu_item_call.on_click - function="MiniMap.ShowProfile" /> - <menu_item_call.on_enable - function="MiniMap.EnableProfile" /> + function="Floater.Show" + parameter="world_map" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index 725321648b..b71b866c4b 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -8,28 +8,40 @@ top="624" visible="false" width="128"> + <menu_item_check + label="Show Coordinates" + name="Show Coordinates"> + <menu_item_check.on_click + function="Navbar.Action" + parameter="show_coordinates" /> + <menu_item_check.on_check + function="Navbar.EnableMenuItem" + parameter="show_coordinates" /> + </menu_item_check> + <menu_item_check + label="Show Parcel Properties" + name="Show Parcel Properties"> + <menu_item_check.on_click + function="Navbar.Action" + parameter="show_properties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> + <menu_item_separator + name="Separator" /> + <!-- Label of 'Landmark' item is changing in runtime, + see AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml --> <menu_item_call - label="Copy SLURL to Clipboard" - layout="topleft" - name="Copy SLURL"> - <menu_item_call.on_click - function="Navbar.Action" - parameter="copy_url" /> - </menu_item_call> - <menu_item_call - label="Add Landmark..." - layout="topleft" - name="Add Landmark"> + label="Landmark" + name="Landmark"> <menu_item_call.on_click function="Navbar.Action" parameter="landmark" /> </menu_item_call> <menu_item_separator - layout="topleft" name="Separator" /> <menu_item_call label="Cut" - layout="topleft" name="Cut"> <menu_item_call.on_click function="Navbar.Action" @@ -40,7 +52,6 @@ </menu_item_call> <menu_item_call label="Copy" - layout="topleft" name="Copy"> <menu_item_call.on_click function="Navbar.Action" @@ -51,7 +62,6 @@ </menu_item_call> <menu_item_call label="Paste" - layout="topleft" name="Paste"> <menu_item_call.on_click function="Navbar.Action" @@ -62,7 +72,6 @@ </menu_item_call> <menu_item_call label="Delete" - layout="topleft" name="Delete"> <menu_item_call.on_click function="Navbar.Action" @@ -73,7 +82,6 @@ </menu_item_call> <menu_item_call label="Select All" - layout="topleft" name="Select All"> <menu_item_call.on_click function="Navbar.Action" diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml index 5eb4b10af9..ff89e20ea5 100644 --- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml @@ -1,17 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100" mouse_opaque="false" name="NearBy Chat Menu" opaque="true" width="128" visible="false"> - <menu_item_call bottom_delta="-18" height="18" label="Keep Visible" left="0" mouse_opaque="true" - name="keep_visible" width="128"> - <menu_item_call.on_click function="NearbyChat.Action" userdata="keep_visible" /> - </menu_item_call> <menu_item_call bottom_delta="-18" height="18" label="Show Nearby People..." left="0" mouse_opaque="true" name="nearby_people" width="128"> <menu_item_call.on_click function="NearbyChat.Action" userdata="nearby_people" /> </menu_item_call> <menu_item_separator /> - <menu_item_check bottom_delta="-18" height="18" label="Show Muted Text" left="0" mouse_opaque="true" + <menu_item_check bottom_delta="-18" height="18" label="Show Blocked Text" left="0" mouse_opaque="true" name="muted_text" width="128"> <menu_item_check.on_click function="NearbyChat.Action" userdata="muted_text" /> <menu_item_check.on_check function="NearbyChat.Check" userdata="muted_text"/> diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml new file mode 100644 index 0000000000..263ac40f4e --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Notification Well Button Context Menu"> + <menu_item_call + label="Close All" + layout="topleft" + name="Close All"> + <menu_item_call.on_click + function="NotificationWellChicletMenu.Action" + parameter="close all" /> + <menu_item_call.on_enable + function="NotificationWellChicletMenu.EnableItem" + parameter="can close all" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml new file mode 100644 index 0000000000..c751aa4e0c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Object Pie"> + <menu_item_call + enabled="false" + label="Touch" + name="Object Touch"> + <menu_item_call.on_click + function="Object.Touch" /> + <menu_item_call.on_enable + function="Object.EnableTouch" + name="EnableTouch" + parameter="Touch" /> + </menu_item_call> + <menu_item_call + label="Edit" + name="Edit..."> + <menu_item_call.on_click + function="Object.Edit" /> + <menu_item_call.on_enable + function="EnableEdit"/> + </menu_item_call> + <menu_item_call + label="Build" + name="Build"> + <menu_item_call.on_click + function="Object.Build" /> + <menu_item_call.on_enable + function="EnableEdit"/> + </menu_item_call> + <menu_item_call + enabled="false" + label="Open" + name="Open"> + <menu_item_call.on_click + function="Object.Open" /> + <menu_item_call.on_enable + function="Object.EnableOpen" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Sit Here" + name="Object Sit"> + <menu_item_call.on_click + function="Object.SitOrStand" /> + <menu_item_call.on_enable + function="Object.EnableSit" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Stand Up" + name="Object Stand Up"> + <menu_item_call.on_click + function="Object.SitOrStand" /> + <menu_item_call.on_enable + function="Object.EnableStandUp" /> + </menu_item_call> + <menu_item_call + label="Object Profile" + name="Object Inspect"> + <menu_item_call.on_click + function="Object.Inspect" /> + <menu_item_call.on_enable + function="Object.EnableInspect" /> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="Zoom In"> + <menu_item_call.on_click + function="Object.ZoomIn" /> + </menu_item_call> +<menu_item_separator layout="topleft" /> + <context_menu + label="Put On" + name="Put On" > + <menu_item_call + enabled="false" + label="Wear" + name="Wear"> + <menu_item_call.on_click + function="Object.AttachToAvatar" /> + <menu_item_call.on_enable + function="Object.EnableWear" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Add" + name="Add"> + <menu_item_call.on_click + function="Object.AttachAddToAvatar" /> + <menu_item_call.on_enable + function="Object.EnableWear" /> + </menu_item_call> + <context_menu + label="Attach" + name="Object Attach" /> + <context_menu + label="Attach HUD" + name="Object Attach HUD" /> + </context_menu> + <context_menu + label="Remove" + name="Remove"> + <menu_item_call + enabled="false" + label="Report Abuse" + name="Report Abuse..."> + <menu_item_call.on_click + function="Object.ReportAbuse" /> + <menu_item_call.on_enable + function="Object.EnableReportAbuse" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Block" + name="Object Mute"> + <menu_item_call.on_click + function="Object.Mute" /> + <menu_item_call.on_enable + function="Object.EnableMute" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Return" + name="Return..."> + <menu_item_call.on_click + function="Object.Return" /> + <menu_item_call.on_enable + function="Object.EnableReturn" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Delete" + name="Delete"> + <menu_item_call.on_click + function="Object.Delete" /> + <menu_item_call.on_enable + function="Object.EnableDelete" /> + </menu_item_call> + </context_menu> + <menu_item_separator layout="topleft" /> + <menu_item_call + label="Take" + layout="topleft" + name="Pie Object Take"> + <menu_item_call.on_click + function="Object.Take"/> + <menu_item_call.on_enable + function="Object.VisibleTake"/> + </menu_item_call> + <menu_item_call + enabled="false" + label="Take Copy" + name="Take Copy"> + <menu_item_call.on_click + function="Tools.TakeCopy" /> + <menu_item_call.on_enable + function="Tools.EnableTakeCopy" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pay" + name="Pay..."> + <menu_item_call.on_click + function="PayObject" /> + <menu_item_call.on_enable + function="EnablePayObject" /> +</menu_item_call> + <menu_item_call + enabled="false" + label="Buy" + name="Buy..."> + <menu_item_call.on_click + function="Object.Buy" /> + <menu_item_call.on_enable + function="Object.EnableBuy" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml new file mode 100644 index 0000000000..0c8a2af002 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="Object Icon Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Object Profile..." + layout="topleft" + name="Object Profile"> + <menu_item_call.on_click + function="ObjectIcon.Action" + parameter="profile" /> + </menu_item_call> + <menu_item_call + label="Block..." + layout="topleft" + name="Block"> + <menu_item_call.on_click + function="ObjectIcon.Action" + parameter="block" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml new file mode 100644 index 0000000000..732b8a788d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + visible="false" + name="Gear Outfit"> + <menu_item_call + label="Wear - Replace Current Outfit" + layout="topleft" + name="wear"> + <on_click + function="Gear.Wear" /> + <on_enable + function="Gear.OnEnable" + parameter="wear" /> + <on_visible + function="Gear.OnVisible" + parameter="wear" /> + </menu_item_call> + <menu_item_call + label="Wear - Add to Current Outfit" + layout="topleft" + name="wear_add"> + <on_click + function="Gear.WearAdd" /> + <on_enable + function="Gear.OnEnable" + parameter="wear_add" /> + </menu_item_call> + <menu_item_call + label="Take Off - Remove from Current Outfit" + layout="topleft" + name="take_off"> + <on_click + function="Gear.TakeOff" /> + <on_enable + function="Gear.OnEnable" + parameter="take_off" /> + <on_visible + function="Gear.OnVisible" + parameter="take_off" /> + </menu_item_call> + + <menu_item_separator name="sepatator1" /> + <!-- copied (with minor modifications) from menu_inventory_add.xml --> + <!-- *TODO: generate dynamically? --> + <menu + height="175" + label="New Clothes" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Clothes" + top_pad="514" + width="125"> + <menu_item_call + label="New Shirt" + layout="topleft" + name="New Shirt"> + <menu_item_call.on_click + function="Gear.Create" + parameter="shirt" /> + </menu_item_call> + <menu_item_call + label="New Pants" + layout="topleft" + name="New Pants"> + <menu_item_call.on_click + function="Gear.Create" + parameter="pants" /> + </menu_item_call> + <menu_item_call + label="New Shoes" + layout="topleft" + name="New Shoes"> + <menu_item_call.on_click + function="Gear.Create" + parameter="shoes" /> + </menu_item_call> + <menu_item_call + label="New Socks" + layout="topleft" + name="New Socks"> + <menu_item_call.on_click + function="Gear.Create" + parameter="socks" /> + </menu_item_call> + <menu_item_call + label="New Jacket" + layout="topleft" + name="New Jacket"> + <menu_item_call.on_click + function="Gear.Create" + parameter="jacket" /> + </menu_item_call> + <menu_item_call + label="New Skirt" + layout="topleft" + name="New Skirt"> + <menu_item_call.on_click + function="Gear.Create" + parameter="skirt" /> + </menu_item_call> + <menu_item_call + label="New Gloves" + layout="topleft" + name="New Gloves"> + <menu_item_call.on_click + function="Gear.Create" + parameter="gloves" /> + </menu_item_call> + <menu_item_call + label="New Undershirt" + layout="topleft" + name="New Undershirt"> + <menu_item_call.on_click + function="Gear.Create" + parameter="undershirt" /> + </menu_item_call> + <menu_item_call + label="New Underpants" + layout="topleft" + name="New Underpants"> + <menu_item_call.on_click + function="Gear.Create" + parameter="underpants" /> + </menu_item_call> + <menu_item_call + label="New Alpha" + layout="topleft" + name="New Alpha"> + <menu_item_call.on_click + function="Gear.Create" + parameter="alpha" /> + </menu_item_call> + <menu_item_call + label="New Tattoo" + layout="topleft" + name="New Tattoo"> + <menu_item_call.on_click + function="Gear.Create" + parameter="tattoo" /> + </menu_item_call> + </menu> + <menu + height="85" + label="New Body Parts" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="New Body Parts" + top_pad="514" + width="118"> + <menu_item_call + label="New Shape" + layout="topleft" + name="New Shape"> + <menu_item_call.on_click + function="Gear.Create" + parameter="shape" /> + </menu_item_call> + <menu_item_call + label="New Skin" + layout="topleft" + name="New Skin"> + <menu_item_call.on_click + function="Gear.Create" + parameter="skin" /> + </menu_item_call> + <menu_item_call + label="New Hair" + layout="topleft" + name="New Hair"> + <menu_item_call.on_click + function="Gear.Create" + parameter="hair" /> + </menu_item_call> + <menu_item_call + label="New Eyes" + layout="topleft" + name="New Eyes"> + <menu_item_call.on_click + function="Gear.Create" + parameter="eyes" /> + </menu_item_call> + </menu> + <!-- copied from menu_inventory_add.xml --> + + <menu_item_separator name="sepatator2" /> + <menu_item_call + label="Rename Outfit" + layout="topleft" + name="rename"> + <on_click + function="Gear.Rename" /> + <on_enable + function="Gear.OnEnable" + parameter="rename" /> + <on_visible + function="Gear.OnVisible" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete Outfit" + layout="topleft" + name="delete_outfit"> + <on_click + function="Gear.Delete" /> + <on_enable + function="Gear.OnEnable" + parameter="delete" /> + <on_visible + function="Gear.OnVisible" + parameter="delete" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml new file mode 100644 index 0000000000..8c8bb29baf --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Outfit"> + <menu_item_call + label="Wear - Replace Current Outfit" + layout="topleft" + name="wear_replace"> + <on_click + function="Outfit.WearReplace" /> + <on_enable + function="Outfit.OnEnable" + parameter="wear_replace" /> + <on_visible + function="Outfit.OnVisible" + parameter="wear_replace" /> + </menu_item_call> + <menu_item_call + label="Wear - Add to Current Outfit" + layout="topleft" + name="wear_add"> + <on_click + function="Outfit.WearAdd" /> + <on_enable + function="Outfit.OnEnable" + parameter="wear_add" /> + <on_visible + function="Outfit.OnVisible" + parameter="wear_add" /> + </menu_item_call> + <menu_item_call + label="Take Off - Remove from Current Outfit" + layout="topleft" + name="take_off"> + <on_click + function="Outfit.TakeOff" /> + <on_enable + function="Outfit.OnEnable" + parameter="take_off" /> + <on_visible + function="Outfit.OnVisible" + parameter="take_off" /> + </menu_item_call> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Outfit.Edit" /> + <on_visible + function="Outfit.OnVisible" + parameter="edit" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Rename Outfit" + layout="topleft" + name="rename"> + <on_click + function="Outfit.Rename" /> + <on_enable + function="Outfit.OnEnable" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete Outfit" + layout="topleft" + name="delete"> + <on_click + function="Outfit.Delete" /> + <on_visible + function="Outfit.OnVisible" + parameter="delete" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml new file mode 100644 index 0000000000..2c32d9d303 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Participant List Context Menu"> + <menu_item_check + label="Sort by Name" + layout="topleft" + name="SortByName"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_name" /> + <on_click + function="ParticipantList.Sort" + parameter="sort_by_name" /> + </menu_item_check> + <menu_item_check + label="Sort by Recent Speakers" + layout="topleft" + name="SortByRecentSpeakers"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_recent_speakers" /> + <on_click + function="ParticipantList.Sort" + parameter="sort_by_recent_speakers" /> + </menu_item_check> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <on_click + function="Avatar.Profile" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_view_profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <on_click + function="Avatar.AddFriend" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <on_click + function="Avatar.IM" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_im" /> + </menu_item_call> + <menu_item_call + label="Call" + layout="topleft" + name="Call"> + <on_click + function="Avatar.Call" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_call" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share"> + <on_click + function="Avatar.Share" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <on_click + function="Avatar.Pay" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_pay" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="View Icons Separator" /> + <menu_item_check + label="View People Icons" + layout="topleft" + name="View Icons"> + <on_check + function="CheckControl" + parameter="ParticipantListShowIcons" /> + <on_click + function="ToggleControl" + parameter="ParticipantListShowIcons" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Block Voice" + layout="topleft" + name="Block/Unblock"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_blocked" /> + <on_click + function="Avatar.BlockUnblock" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_block" /> + </menu_item_check> + <menu_item_check + label="Block Text" + layout="topleft" + name="MuteText"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_muted" /> + <on_click + function="ParticipantList.ToggleMuteText" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_mute_text" /> + </menu_item_check> + <menu_item_separator + layout="topleft" + name="Moderator Options Separator"/> + <context_menu + label="Moderator Options" + layout="topleft" + name="Moderator Options"> + <menu_item_check + label="Allow text chat" + layout="topleft" + name="AllowTextChat"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_allowed_text_chat" /> + <on_click + function="ParticipantList.ToggleAllowTextChat" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_allow_text_chat" /> + </menu_item_check> + <menu_item_separator + layout="topleft" + name="moderate_voice_separator" /> + <menu_item_call + label="Mute this participant" + layout="topleft" + name="ModerateVoiceMuteSelected"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="selected" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Unmute this participant" + layout="topleft" + name="ModerateVoiceUnMuteSelected"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="selected" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Mute everyone" + layout="topleft" + name="ModerateVoiceMute"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="mute_all" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Unmute everyone" + layout="topleft" + name="ModerateVoiceUnmute"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="unmute_all" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + </context_menu> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml new file mode 100644 index 0000000000..22796f7b68 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="sort_name" /> + <menu_item_check.on_check + function="People.Friends.ViewSort.CheckItem" + parameter="sort_name" /> + </menu_item_check> + <menu_item_check + label="Sort by Status" + name="sort_status"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="sort_status" /> + <menu_item_check.on_check + function="People.Friends.ViewSort.CheckItem" + parameter="sort_status" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="view_icons" label="View People Icons"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="view_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="FriendsListShowIcons" /> + </menu_item_check> + <menu_item_check name="view_permissions" label="View Permissions Granted"> + <menu_item_check.on_click + function="People.Friends.ViewSort.Action" + parameter="view_permissions" /> + <menu_item_check.on_check + function="CheckControl" + parameter="FriendsListShowPermissions" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> + <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml new file mode 100644 index 0000000000..8f89d37dbb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor"> + <menu_item_call + label="View Info" + name="View Info"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="view_info" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="view_info" /> + </menu_item_call> + <menu_item_call + label="Chat" + name="Chat"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="chat" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="chat" /> + </menu_item_call> + <menu_item_call + label="Call" + name="Call"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="call" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="call" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Activate" + name="Activate"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="activate" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="activate" /> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Leave" + name="Leave"> + <menu_item_call.on_click + function="People.Groups.Action" + parameter="leave" /> + <menu_item_call.on_enable + function="People.Groups.Enable" + parameter="leave" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml new file mode 100644 index 0000000000..2efb204ffb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Display Group Icons" + layout="topleft" + name="Display Group Icons"> + <menu_item_check.on_click + function="People.Groups.ViewSort.Action" + parameter="show_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="GroupListShowIcons" /> + </menu_item_check> + <menu_item_call + label="Leave Selected Group" + layout="topleft" + name="Leave Selected Group"> + <menu_item_call.on_click + function="People.Group.Minus.Action"/> + <menu_item_call.on_enable + function="People.Group.Minus.Enable"/> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml new file mode 100644 index 0000000000..d2e35e4cc0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Avatar Context Menu"> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <menu_item_call.on_click + function="Avatar.Profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="Remove Friend" + layout="topleft" + name="Remove Friend"> + <menu_item_call.on_click + function="Avatar.RemoveFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <menu_item_call.on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + label="Call" + layout="topleft" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_call" /> + </menu_item_call> + <menu_item_call + label="Map" + layout="topleft" + name="Map"> + <menu_item_call.on_click + function="Avatar.ShowOnMap" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_show_on_map" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="Share"> + <menu_item_call.on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <menu_item_call.on_click + function="Avatar.Pay" /> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="Block/Unblock"> + <menu_item_check.on_click + function="Avatar.BlockUnblock" /> + <menu_item_check.on_check + function="Avatar.CheckItem" + parameter="is_blocked" /> + <menu_item_check.on_enable + function="Avatar.EnableItem" + parameter="can_block" /> + </menu_item_check> + <menu_item_call + label="Offer Teleport" + name="teleport"> + <menu_item_call.on_click + function="Avatar.OfferTeleport"/> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_offer_teleport"/> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml new file mode 100644 index 0000000000..5d58a9d289 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Multi-Selected People Context Menu"> + <menu_item_call + enabled="false" + label="Add Friends" + layout="topleft" + name="Add Friends"> + <on_click + function="Avatar.AddFriends" /> + <on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="Remove Friends" + layout="topleft" + name="Remove Friend"> + <menu_item_call.on_click + function="Avatar.RemoveFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_delete" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Call" + layout="topleft" + name="Call"> + <on_click + function="Avatar.Call" /> + <on_enable + function="Avatar.EnableItem" + parameter="can_call" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Share" + layout="topleft" + name="Share"> + <on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pay" + layout="topleft" + name="Pay"> + <on_click + function="Avatar.Pay" /> + </menu_item_call> + <menu_item_call + label="Offer Teleport" + name="teleport"> + <menu_item_call.on_click + function="Avatar.OfferTeleport"/> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_offer_teleport"/> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml new file mode 100644 index 0000000000..69b3831738 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by Recent Speakers" + name="sort_by_recent_speakers"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_by_recent_speakers"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_by_recent_speakers"/> + </menu_item_check> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_name"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_name"/> + </menu_item_check> + <menu_item_check + label="Sort by Distance" + name="sort_distance"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_distance"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_distance"/> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="view_icons" label="View People Icons"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="view_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="NearbyListShowIcons" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> + <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml new file mode 100644 index 0000000000..5c9555db92 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false"> + <menu_item_check + label="Sort by Most Recent" + name="sort_most"> + <menu_item_check.on_click + function="People.Recent.ViewSort.Action" + parameter="sort_recent" /> + <menu_item_check.on_check + function="People.Recent.ViewSort.CheckItem" + parameter="sort_recent" /> + </menu_item_check> + <menu_item_check + label="Sort by Name" + name="sort_name"> + <menu_item_check.on_click + function="People.Recent.ViewSort.Action" + parameter="sort_name" /> + <menu_item_check.on_check + function="People.Recent.ViewSort.CheckItem" + parameter="sort_name" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_check name="view_icons" label="View People Icons"> + <menu_item_check.on_click + function="People.Recent.ViewSort.Action" + parameter="view_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="RecentListShowIcons" /> + </menu_item_check> + <menu_item_separator layout="topleft" /> + <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> + <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml new file mode 100644 index 0000000000..ebb49c9004 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_picks.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Picks"> + <menu_item_call + label="Info" + layout="topleft" + name="pick_info"> + <menu_item_call.on_click + function="Pick.Info" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="info" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="pick_edit" + visible="false"> + <menu_item_call.on_click + function="Pick.Edit" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Teleport" + layout="topleft" + name="pick_teleport"> + <menu_item_call.on_click + function="Pick.Teleport" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="teleport" /> + </menu_item_call> + <menu_item_call + label="Map" + layout="topleft" + name="pick_map"> + <menu_item_call.on_click + function="Pick.Map" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="map" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="pick_separator" + visible="false" /> + <menu_item_call + label="Delete" + layout="topleft" + name="pick_delete" + visible="false"> + <menu_item_call.on_click + function="Pick.Delete" /> + <menu_item_call.on_enable + function="Pick.Enable" + parameter="delete" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml new file mode 100644 index 0000000000..f3b207e36c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="201" + layout="topleft" + mouse_opaque="false" + name="picks_plus_menu" + width="120"> + <menu_item_call + name="create_pick" + label="New Pick"> + <menu_item_call.on_click + function="Picks.Plus.Action" + userdata="new_pick" /> + <menu_item_call.on_enable + function="Picks.Plus.Enable" + userdata="new_pick" /> + </menu_item_call> + <menu_item_call + name="create_classified" + label="New Classified"> + <menu_item_call.on_click + function="Picks.Plus.Action" + userdata="new_classified" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml new file mode 100644 index 0000000000..1b96eb51f0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_place.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="201" + layout="topleft" + mouse_opaque="false" + name="place_overflow_menu" + width="128"> + <menu_item_call + label="Make a Landmark" + layout="topleft" + name="landmark"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="landmark" /> + </menu_item_call> + <menu_item_call + label="Create Pick" + layout="topleft" + name="pick"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="pick" /> + <menu_item_call.on_enable + function="Places.OverflowMenu.Enable" + parameter="can_create_pick" /> + </menu_item_call> + <menu_item_separator + layout="topleft"/> + <menu_item_call + enabled="false" + label="Buy Pass" + layout="topleft" + name="pass"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="pass" /> + </menu_item_call> + <menu_item_separator + layout="topleft"/> + <menu_item_call + enabled="false" + label="Edit" + layout="topleft" + name="edit"> + <menu_item_call.on_click + function="Places.OverflowMenu.Action" + parameter="edit" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml new file mode 100644 index 0000000000..e3a39a1242 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_folder_gear" + visible="false"> + <menu_item_call + label="Add Folder" + layout="topleft" + name="add_folder"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="category" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="category" /> + </menu_item_call> + <menu_item_call + label="Add Landmark" + layout="topleft" + name="add_landmark"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="add_landmark" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml new file mode 100644 index 0000000000..77cc3910fd --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_folder_gear" + visible="false"> + <menu_item_call + label="Add Landmark" + layout="topleft" + name="add_landmark"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="add_landmark" /> + </menu_item_call> + <menu_item_call + label="Add Folder" + layout="topleft" + name="add_folder"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="category" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="category" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Cut" + layout="topleft" + name="cut"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="cut" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="cut" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="copy_folder"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="paste" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="rename" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="delete"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="delete" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="delete" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Expand" + layout="topleft" + name="expand"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="expand" /> + <on_visible + function="Places.LandmarksGear.Enable" + parameter="expand" /> + </menu_item_call> + <menu_item_call + label="Collapse" + layout="topleft" + name="collapse"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="collapse" /> + <on_visible + function="Places.LandmarksGear.Enable" + parameter="collapse" /> + </menu_item_call> + <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="expand_all" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="collapse_all" /> + </menu_item_call> + <menu_item_check + label="Sort by Date" + layout="topleft" + name="sort_by_date"> + <on_check + function="Places.LandmarksGear.Check" + parameter="sort_by_date" /> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="sort_by_date" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..4b8bc8132f --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_ladmark_gear" + visible="false"> + <menu_item_call + label="Teleport" + layout="topleft" + name="teleport"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="teleport" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="teleport" /> + </menu_item_call> + <menu_item_call + label="More Information" + layout="topleft" + name="more_info"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="more_info" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="more_info" /> + </menu_item_call> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="show_on_map" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="show_on_map" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Add Landmark" + layout="topleft" + name="add_landmark"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="add_landmark" /> + </menu_item_call> + <menu_item_call + label="Add Folder" + layout="topleft" + name="add_folder"> + <on_click + function="Places.LandmarksGear.Add.Action" + parameter="category" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="category" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Cut" + layout="topleft" + name="cut"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="cut" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="cut" /> + </menu_item_call> + <menu_item_call + label="Copy Landmark" + layout="topleft" + name="copy_landmark"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl" + layout="topleft" + name="copy_slurl"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="copy_slurl" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="copy_slurl" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="paste"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="paste" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="paste" /> + </menu_item_call> + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="rename" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="delete"> + <on_click + function="Places.LandmarksGear.CopyPaste.Action" + parameter="delete" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="delete" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Expand all folders" + layout="topleft" + name="expand_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="expand_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="expand_all" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + layout="topleft" + name="collapse_all"> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="collapse_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="collapse_all" /> + </menu_item_call> + <menu_item_check + label="Sort by Date" + layout="topleft" + name="sort_by_date"> + <on_check + function="Places.LandmarksGear.Check" + parameter="sort_by_date" /> + <on_click + function="Places.LandmarksGear.Folding.Action" + parameter="sort_by_date" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="sort_by_date" /> + </menu_item_check> + <menu_item_call + label="Create Pick" + layout="topleft" + name="create_pick"> + <on_click + function="Places.LandmarksGear.Custom.Action" + parameter="create_pick" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="create_pick" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml new file mode 100644 index 0000000000..b0b7b554b0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="50" + layout="topleft" + mouse_opaque="false" + name="profile_overflow_menu" + width="120"> + <menu_item_call + label="Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Profile.ShowOnMap" /> + <menu_item_call.on_enable + function="Profile.EnableShowOnMap" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="Profile.Pay" /> + </menu_item_call> + <menu_item_call + label="Share" + layout="topleft" + name="share"> + <menu_item_call.on_click + function="Profile.Share" /> + </menu_item_call> + <menu_item_call + label="Block" + name="block"> + <menu_item_call.on_click + function="Profile.BlockUnblock"/> + <menu_item_call.on_visible + function="Profile.EnableBlock" /> + </menu_item_call> + <menu_item_call + label="Unblock" + name="unblock"> + <menu_item_call.on_click + function="Profile.BlockUnblock"/> + <menu_item_call.on_visible + function="Profile.EnableUnblock" /> + </menu_item_call> + <menu_item_call + label="Kick" + layout="topleft" + name="kick"> + <menu_item_call.on_click + function="Profile.Kick" /> + <menu_item_call.on_visible + function="Profile.EnableGod" /> + </menu_item_call> + <menu_item_call + label="Freeze" + layout="topleft" + name="freeze"> + <menu_item_call.on_click + function="Profile.Freeze" /> + <menu_item_call.on_visible + function="Profile.EnableGod" /> + </menu_item_call> + <menu_item_call + label="Unfreeze" + layout="topleft" + name="unfreeze"> + <menu_item_call.on_click + function="Profile.Unfreeze" /> + <menu_item_call.on_visible + function="Profile.EnableGod" /> + </menu_item_call> + <menu_item_call + label="CSR" + layout="topleft" + name="csr"> + <menu_item_call.on_click + function="Profile.CSR" /> + <menu_item_call.on_visible + function="Profile.EnableGod" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml new file mode 100644 index 0000000000..6285bf7417 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu + height="201" + layout="topleft" + mouse_opaque="false" + name="save_outfit_menu" + width="120"> + <menu_item_call + name="save_outfit" + label="Save"> + <menu_item_call.on_click + function="Outfit.Save.Action" + userdata=""/> + </menu_item_call> + <menu_item_call + name="save_as_new_outfit" + label="Save As"> + <menu_item_call.on_click + function="Outfit.SaveAs.Action" + userdata="" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml new file mode 100644 index 0000000000..db29d9cebc --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="101" + layout="topleft" + left="100" + mouse_opaque="false" + name="ScriptChiclet Menu" + top="724" + visible="false" + width="128"> + <menu_item_call + label="Close" + layout="topleft" + name="Close"> + <menu_item_call.on_click + function="ScriptChiclet.Action" + parameter="end" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml index d5d9d3c43d..ee37d49946 100644 --- a/indra/newview/skins/default/xui/en/menu_slurl.xml +++ b/indra/newview/skins/default/xui/en/menu_slurl.xml @@ -27,7 +27,7 @@ parameter="about" /> </menu_item_call> <menu_item_call - label="Show on Map" + label="Map" layout="topleft" name="show_on_map"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml new file mode 100644 index 0000000000..134b331514 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + name="Teleport History Gear Context Menu" + left="0" + bottom="0" + visible="false" + mouse_opaque="false" + opaque="true" + color="MenuDefaultBgColor" + drop_shadow="true" > + <menu_item_call + label="Expand all folders" + name="Expand all folders"> + <menu_item_call.on_click + function="TeleportHistory.ExpandAllFolders" /> + <on_enable + function="TeleportHistory.GearMenu.Enable" + parameter="expand_all" /> + </menu_item_call> + <menu_item_call + label="Collapse all folders" + name="Collapse all folders"> + <menu_item_call.on_click + function="TeleportHistory.CollapseAllFolders" /> + <on_enable + function="TeleportHistory.GearMenu.Enable" + parameter="collapse_all" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_call + label="Clear Teleport History" + name="Clear Teleport History"> + <menu_item_call.on_click + function="TeleportHistory.ClearTeleportHistory" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml new file mode 100644 index 0000000000..0160d52b17 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Teleport History Item Context Menu"> + <menu_item_call + label="Teleport" + layout="topleft" + name="Teleport"> + <menu_item_call.on_click + function="TeleportHistory.Teleport" /> + </menu_item_call> + <menu_item_call + label="More Information" + layout="topleft" + name="More Information"> + <menu_item_call.on_click + function="TeleportHistory.MoreInformation" /> + </menu_item_call> + <menu_item_call + label="Copy to Clipboard" + layout="topleft" + name="CopyToClipboard"> + <menu_item_call.on_click + function="TeleportHistory.CopyToClipboard" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml new file mode 100644 index 0000000000..ecc1d8a954 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Teleport History Item Context Menu"> + <menu_item_call + label="Open" + layout="topleft" + name="TabOpen"> + <menu_item_call.on_click + function="TeleportHistory.TabOpen" /> + </menu_item_call> + <menu_item_call + label="Close" + layout="topleft" + name="TabClose"> + <menu_item_call.on_click + function="TeleportHistory.TabClose" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml new file mode 100644 index 0000000000..ecd96088e7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + name="Text editor context menu"> + <menu_item_call + label="Cut" + layout="topleft" + name="Cut" + shortcut="control|X"> + <menu_item_call.on_click + function="Edit.Cut" /> + <menu_item_call.on_enable + function="Edit.EnableCut" /> + </menu_item_call> + <menu_item_call + label="Copy" + layout="topleft" + name="Copy" + shortcut="control|C"> + <menu_item_call.on_click + function="Edit.Copy" /> + <menu_item_call.on_enable + function="Edit.EnableCopy" /> + </menu_item_call> + <menu_item_call + label="Paste" + layout="topleft" + name="Paste" + shortcut="control|V"> + <menu_item_call.on_click + function="Edit.Paste" /> + <menu_item_call.on_enable + function="Edit.EnablePaste" /> + </menu_item_call> + <menu_item_call + label="Delete" + layout="topleft" + name="Delete" + shortcut="Del"> + <menu_item_call.on_click + function="Edit.Delete" /> + <menu_item_call.on_enable + function="Edit.EnableDelete" /> + </menu_item_call> + <menu_item_call + label="Select All" + layout="topleft" + name="Select All" + shortcut="control|A"> + <menu_item_call.on_click + function="Edit.SelectAll" /> + <menu_item_call.on_enable + function="Edit.EnableSelectAll" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml new file mode 100644 index 0000000000..cbe249ed4d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="201" + layout="topleft" + left="100" + mouse_opaque="false" + name="menu_topinfobar" + top="624" + visible="false" + width="128"> + <menu_item_check + label="Show Coordinates" + name="Show Coordinates"> + <on_click + function="ToggleControl" + parameter="NavBarShowCoordinates" /> + <on_check + function="CheckControl" + parameter="NavBarShowCoordinates" /> + </menu_item_check> + <menu_item_check + label="Show Parcel Properties" + name="Show Parcel Properties"> + <on_click + function="ToggleControl" + parameter="NavBarShowParcelProperties" /> + <on_check + function="CheckControl" + parameter="NavBarShowParcelProperties" /> + </menu_item_check> + <menu_item_separator + name="Separator" /> + <!-- Label of 'Landmark' item is changing in runtime, + see AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml --> + <menu_item_call + label="Landmark" + name="Landmark"> + <on_click + function="TopInfoBar.Action" + parameter="landmark" /> + </menu_item_call> + <menu_item_separator + name="Separator" /> + <menu_item_call + label="Copy" + name="Copy"> + <on_click + function="TopInfoBar.Action" + parameter="copy" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml new file mode 100644 index 0000000000..73f0fa7979 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Resident Profile" + layout="topleft" + name="show_agent"> + <menu_item_call.on_click + function="Url.ShowProfile" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Name to clipboard" + layout="topleft" + name="url_copy_label"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml new file mode 100644 index 0000000000..2cb125ce09 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_group.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Group Information" + layout="topleft" + name="show_group"> + <menu_item_call.on_click + function="Url.ShowProfile" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Group to clipboard" + layout="topleft" + name="url_copy_label"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml new file mode 100644 index 0000000000..7a4b1e619b --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_http.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Open Web Page" + layout="topleft" + name="url_open"> + <menu_item_call.on_click + function="Url.Open" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Open in Internal Browser" + layout="topleft" + name="url_open_internal"> + <menu_item_call.on_click + function="Url.OpenInternal" /> + </menu_item_call> + <menu_item_call + label="Open in External Browser" + layout="topleft" + name="url_open_external"> + <menu_item_call.on_click + function="Url.OpenExternal" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy URL to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml new file mode 100644 index 0000000000..cf9d1d5881 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Inventory Item" + layout="topleft" + name="show_item"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Name to clipboard" + layout="topleft" + name="url_copy_label"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml new file mode 100644 index 0000000000..2ca9e3b3fe --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_map.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Teleport to Location" + layout="topleft" + name="teleport_to_location"> + <menu_item_call.on_click + function="Url.Teleport" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml new file mode 100644 index 0000000000..35c2269b0d --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Object Information" + layout="topleft" + name="show_object"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Url.ShowOnMap" /> + </menu_item_call> + <menu_item_call + label="Teleport to Object Location" + layout="topleft" + name="teleport_to_object"> + <menu_item_call.on_click + function="Url.Teleport" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy Object Name to clipboard" + layout="topleft" + name="url_copy_label"> + <menu_item_call.on_click + function="Url.CopyLabel" /> + </menu_item_call> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml new file mode 100644 index 0000000000..f477c310fb --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Parcel Information" + layout="topleft" + name="show_parcel"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Url.ShowOnMap" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml new file mode 100644 index 0000000000..6d1060b633 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Run This Command" + layout="topleft" + name="run_slapp"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml new file mode 100644 index 0000000000..98abc206a5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Show Place Information" + layout="topleft" + name="show_place"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Url.ShowOnMap" /> + </menu_item_call> + <menu_item_call + label="Teleport to Location" + layout="topleft" + name="teleport_to_location"> + <menu_item_call.on_click + function="Url.Teleport" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml new file mode 100644 index 0000000000..289e32bcf4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Url Popup"> + <menu_item_call + label="Teleport to this Location" + layout="topleft" + name="teleport"> + <menu_item_call.on_click + function="Url.Execute" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Show on Map" + layout="topleft" + name="show_on_map"> + <menu_item_call.on_click + function="Url.ShowOnMap" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Copy SLurl to clipboard" + layout="topleft" + name="url_copy"> + <menu_item_call.on_click + function="Url.CopyUrl" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 926b51d4c1..af241862b6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2,99 +2,57 @@ <menu_bar bg_visible="false" follows="left|top|right" - layout="topleft" name="Main Menu"> <menu + create_jump_keys="true" label="Me" - layout="topleft" name="Me" tear_off="true"> <menu_item_call label="Preferences" - layout="topleft" name="Preferences" shortcut="control|P"> <menu_item_call.on_click - function="ShowFloater" + function="Floater.Show" parameter="preferences" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - label="My Account" - layout="topleft" - name="My Account" - tear_off="true"> - <menu_item_call - label="Account History" - layout="topleft" - name="Account History"> - <menu_item_call.on_click - function="PromptShowURL" - parameter="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" /> - </menu_item_call> - <menu_item_call - label="Manage My Account" - layout="topleft" + <menu_item_call + label="My Dashboard" name="Manage My Account"> <menu_item_call.on_click function="PromptShowURL" + name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="My Land" - layout="topleft" - name="My Land"> - <menu_item_call.on_click - function="ShowFloater" - parameter="my land" /> - </menu_item_call> - <menu_item_call - label="Buy Land" - layout="topleft" - name="Buy Land"> - <menu_item_call.on_click - function="ShowFloater" - parameter="buy land" /> - <menu_item_call.on_enable - function="World.EnableBuyLand" /> - </menu_item_call> - </menu> + </menu_item_call> <menu_item_call label="Buy L$" - layout="topleft" name="Buy and Sell L$"> <menu_item_call.on_click - function="ShowFloater" - parameter="buy currency" /> + function="BuyCurrency" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_call label="My Profile" - layout="topleft" name="Profile"> <menu_item_call.on_click function="ShowAgentProfile" parameter="agent" /> </menu_item_call> <menu_item_call - label="My Appearance" - layout="topleft" - name="Appearance"> + label="Change Outfit" + name="ChangeOutfit"> <menu_item_call.on_click - function="ShowFloater" - parameter="appearance" /> + function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> <menu_item_check label="My Inventory" - layout="topleft" name="Inventory" - shortcut="control|I"> + shortcut="control|shift|I" + visible="false"> <menu_item_check.on_check function="Floater.Visible" parameter="inventory" /> @@ -102,42 +60,79 @@ function="Floater.Toggle" parameter="inventory" /> </menu_item_check> - <menu_item_call + <menu_item_check + label="My Inventory" + name="ShowSidetrayInventory" + shortcut="control|I" + visible="true"> + <menu_item_check.on_check + function="SidetrayPanelVisible" + parameter="sidepanel_inventory" /> + <menu_item_check.on_click + function="ShowSidetrayPanel" + parameter="sidepanel_inventory" /> + </menu_item_check> + <menu_item_check label="My Gestures" - layout="topleft" name="Gestures" shortcut="control|G"> - <menu_item_call.on_click - function="ShowFloater" + <menu_item_check.on_check + function="Floater.Visible" parameter="gestures" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="gestures" /> + </menu_item_check> + <menu_item_check + label="My Voice" + name="ShowVoice" + visibility_control="VoiceMorphingEnabled"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="voice_effect" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="voice_effect" /> + </menu_item_check> <menu - label="Status" - layout="topleft" + create_jump_keys="true" + label="My Status" name="Status" tear_off="true"> <menu_item_call - label="Set Away" - layout="topleft" + label="Away" name="Set Away"> <menu_item_call.on_click function="World.SetAway" /> </menu_item_call> <menu_item_call - label="Set Busy" - layout="topleft" + label="Busy" name="Set Busy"> <menu_item_call.on_click - function="World.SetBusy" /> + function="World.SetBusy"/> </menu_item_call> </menu> - <menu_item_separator - layout="topleft" /> <menu_item_call - label="Exit Second Life" - layout="topleft" + label="Request Admin Status" + name="Request Admin Options" + shortcut="control|alt|G" + visible="false"> + <menu_item_call.on_click + function="Advanced.RequestAdminStatus" /> + </menu_item_call> + <menu_item_call + label="Leave Admin Status" + name="Leave Admin Options" + shortcut="control|alt|shift|G" + visible="false"> + <menu_item_call.on_click + function="Advanced.LeaveAdminStatus" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_call + label="Exit [APP_NAME]" name="Quit" shortcut="control|Q"> <menu_item_call.on_click @@ -145,56 +140,40 @@ </menu_item_call> </menu> <menu + create_jump_keys="true" label="Communicate" - layout="topleft" name="Communicate" tear_off="true"> - <menu_item_check + <menu_item_call label="My Friends" - layout="topleft" name="My Friends" shortcut="control|shift|F"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="contacts.friends" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="contacts.friends" /> - </menu_item_check> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> <menu_item_call label="My Groups" - layout="topleft" - name="My Groups"> + name="My Groups" + shortcut="control|shift|G"> <menu_item_call.on_click - function="Floater.Show" - parameter="contacts.groups" /> + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call + + <menu_item_separator/> + + <!--menu_item_call label="Chat" - layout="topleft" name="Chat"> <menu_item_call.on_click function="World.Chat" /> - </menu_item_call> - <menu_item_check - label="Local Chat" - layout="topleft" - name="Chat History" - shortcut="control|H"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="chat" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="chat" /> - </menu_item_check> + </menu_item_call--> <menu_item_check label="Nearby Chat" - layout="topleft" name="Nearby Chat" - shortcut="control|N"> + shortcut="control|H" + use_mac_ctrl="true"> <menu_item_check.on_check function="Floater.Visible" parameter="nearby_chat" /> @@ -202,399 +181,578 @@ function="Floater.Toggle" parameter="nearby_chat" /> </menu_item_check> - <menu_item_check - label="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_separator - layout="topleft" /> - <menu_item_check - label="Active Speakers" - layout="topleft" - name="Active Speakers"> - <menu_item_check.on_check - function="FloaterVisible" - parameter="active speakers" /> - <menu_item_check.on_click - function="ShowFloater" - parameter="active speakers" /> - </menu_item_check> - <menu_item_check - label="Mute List" - layout="topleft" - name="Mute List"> - <menu_item_check.on_check - function="FloaterVisible" - parameter="mute list" /> - <menu_item_check.on_click - function="ShowFloater" - parameter="mute list" /> - </menu_item_check> + <menu_item_call + label="Nearby People" + name="Active Speakers" + shortcut="control|shift|A"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="nearby_panel" /> + </menu_item_call> </menu> <menu + create_jump_keys="true" label="World" - layout="topleft" name="World" tear_off="true"> - <menu_item_check - label="Camera Controls" - layout="topleft" - name="Camera Controls"> + <menu_item_check + label="Mini-Map" + name="Mini-Map" + shortcut="control|shift|M"> <menu_item_check.on_check - function="FloaterVisible" - parameter="camera controls" /> + function="Floater.Visible" + parameter="mini_map" /> <menu_item_check.on_click - function="ShowFloater" - parameter="camera controls" /> + function="Floater.Toggle" + parameter="mini_map" /> </menu_item_check> - <menu_item_check - label="Movement Controls" - layout="topleft" - name="Movement Controls"> + <menu_item_check + label="World Map" + name="World Map" + shortcut="control|M" + use_mac_ctrl="true"> <menu_item_check.on_check - function="FloaterVisible" - parameter="movement controls" /> + function="Floater.Visible" + parameter="world_map" /> <menu_item_check.on_click - function="ShowFloater" - parameter="movement controls" /> + function="Floater.Toggle" + parameter="world_map" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> <menu_item_call - label="About Land" + label="Snapshot" + name="Take Snapshot" + shortcut="control|shift|S"> + <menu_item_call.on_click + function="Floater.Show" + parameter="snapshot" /> + </menu_item_call> + <menu_item_call + label="Landmark This Place" + name="Create Landmark Here"> + <menu_item_call.on_click + function="World.CreateLandmark" /> + <menu_item_call.on_enable + function="World.EnableCreateLandmark" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Place Profile" + name="Land" + tear_off="true"> + <menu_item_call + label="Place Profile" layout="topleft" + name="Place Profile"> + <menu_item_call.on_click + function="World.PlaceProfile" /> + </menu_item_call> + <menu_item_call + label="About Land" name="About Land"> <menu_item_call.on_click - function="ShowFloater" - parameter="about land" /> + function="Floater.Show" + parameter="about_land" /> </menu_item_call> <menu_item_call label="Region/Estate" - layout="topleft" name="Region/Estate"> <menu_item_call.on_click - function="ShowFloater" - parameter="about region" /> + function="Floater.Show" + parameter="region_info" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - label="Landmarks" - layout="topleft" - name="Landmarks" - tear_off="true"> - <menu_item_call - label="Create Landmark Here" - layout="topleft" - name="Create Landmark Here"> - <menu_item_call.on_click - function="World.CreateLandmark" /> - <menu_item_call.on_enable - function="World.EnableCreateLandmark" /> - </menu_item_call> - <menu_item_call - label="Set Home to Here" - layout="topleft" - name="Set Home to Here"> + </menu> + + <menu_item_separator/> + + <menu_item_call + label="Buy This Land" + name="Buy Land"> <menu_item_call.on_click - function="World.SetHomeLocation" /> + function="Land.Buy" /> <menu_item_call.on_enable - function="World.EnableSetHomeLocation" /> + function="World.EnableBuyLand" /> </menu_item_call> - <menu_item_call - label="Teleport Home" - layout="topleft" - name="Teleport Home" - shortcut="control|shift|H"> + <menu_item_call + label="My Land" + name="My Land"> <menu_item_call.on_click - function="World.TeleportHome" /> - <menu_item_call.on_enable - function="World.EnableTeleportHome" /> - </menu_item_call> - </menu> - <menu_item_check - label="Search" - layout="topleft" - name="Search" - shortcut="control|F"> + function="Floater.Show" + parameter="land_holdings" /> + </menu_item_call> + <menu + create_jump_keys="true" + label="Show" + name="LandShow" + tear_off="true"> + <menu_item_check + label="Move Controls" + name="Movement Controls"> <menu_item_check.on_check function="Floater.Visible" - parameter="search" /> + parameter="moveview" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="search" /> + function="World.Toggle.MovementControls" /> </menu_item_check> <menu_item_check - label="World Map" - layout="topleft" - name="World Map" - shortcut="control|M"> + label="View Controls" + name="Camera Controls"> <menu_item_check.on_check function="Floater.Visible" - parameter="world_map" /> + parameter="camera" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="world_map" /> + function="World.Toggle.CameraControls" /> </menu_item_check> - <menu_item_check - label="Mini-Map" - layout="topleft" - name="Mini-Map" - shortcut="control|shift|M"> + <menu_item_check + label="Ban Lines" + name="Ban Lines"> <menu_item_check.on_check - function="FloaterVisible" /> + control="ShowBanLines" /> <menu_item_check.on_click - function="ShowFloater" - parameter="mini_map" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Take Snapshot" - layout="topleft" - name="Take Snapshot" - shortcut="control|shift|S"> - <menu_item_call.on_click - function="Floater.Show" - parameter="snapshot" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Build" - layout="topleft" - name="Build" - shortcut="B"> + function="ToggleControl" + parameter="ShowBanLines" /> + </menu_item_check> + <menu_item_check + label="Beacons" + name="beacons" + shortcut="control|alt|shift|N"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="beacons" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="beacons" /> + </menu_item_check> + <menu_item_check + label="Property Lines" + name="Property Lines" + shortcut="control|alt|shift|P"> <menu_item_check.on_check - function="Build.Active" /> + control="ShowPropertyLines" /> <menu_item_check.on_click - function="Build.Toggle" /> - <menu_item_check.on_enable - function="Build.Enabled" /> + function="ToggleControl" + parameter="ShowPropertyLines" /> + </menu_item_check> + <menu_item_check + label="Land Owners" + name="Land Owners"> + <menu_item_check.on_check + control="ShowParcelOwners" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowParcelOwners" /> + </menu_item_check> + <menu_item_check + label="Coordinates" + name="Coordinates"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowCoordinates" /> + <menu_item_check.on_check + control="NavBarShowCoordinates" /> + </menu_item_check> + <menu_item_check + label="Parcel Properties" + name="Parcel Properties"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowParcelProperties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> + </menu> + + <menu_item_separator/> + + <menu_item_call + label="Teleport Home" + name="Teleport Home" + shortcut="control|shift|H"> + <menu_item_call.on_click + function="World.TeleportHome" /> + <menu_item_call.on_enable + function="World.EnableTeleportHome" /> + </menu_item_call> + <menu_item_call + label="Set Home to Here" + name="Set Home to Here"> + <menu_item_call.on_click + function="World.SetHomeLocation" /> + <menu_item_call.on_enable + function="World.EnableSetHomeLocation" /> + </menu_item_call> + <!-- <menu_item_check + label="Show Navigation Bar" + name="ShowNavbarNavigationPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> </menu_item_check> - </menu> + <menu_item_check + label="Show Favorites Bar" + name="ShowNavbarFavoritesPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> + </menu_item_check> + <menu_item_separator/>--> + + <menu_item_separator/> + <menu - label="Help" - layout="topleft" - name="Help" - tear_off="true"> - <menu_item_call - label="Second Life Help" - layout="topleft" - name="Second Life Help" - shortcut="F1"> - <menu_item_call.on_click - function="ShowFloater" - parameter="help f1" /> - </menu_item_call> - <menu_item_call - label="Tutorial" - layout="topleft" - name="Tutorial"> - <menu_item_call.on_click - function="ShowFloater" - parameter="help tutorial" /> - </menu_item_call> - <menu - label="Report" - layout="topleft" - name="Report" + create_jump_keys="true" + label="Sun" + name="Environment Settings" tear_off="true"> <menu_item_call - label="Report Abuse" - layout="topleft" - name="Report Abuse"> + label="Sunrise" + name="Sunrise"> <menu_item_call.on_click - function="ShowFloater" - parameter="complaint reporter" /> + function="World.EnvSettings" + parameter="sunrise" /> </menu_item_call> <menu_item_call - label="Report Bug" - layout="topleft" - name="Report Bug"> + label="Midday" + name="Noon" + shortcut="control|shift|Y"> <menu_item_call.on_click - function="PromptShowURL" - parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> + function="World.EnvSettings" + parameter="noon" /> </menu_item_call> <menu_item_call - label="Bumps, Pushes & Hits." - layout="topleft" - name="Bumps, Pushes &amp; Hits"> + label="Sunset" + name="Sunset" + shortcut="control|shift|N"> <menu_item_call.on_click - function="ShowFloater" - parameter="mean events" /> + function="World.EnvSettings" + parameter="sunset" /> </menu_item_call> <menu_item_call - label="About Second Life" - layout="topleft" - name="About Second Life"> + label="Midnight" + name="Midnight"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="midnight" /> + </menu_item_call> + <menu_item_call + label="Estate Time" + name="Revert to Region Default"> <menu_item_call.on_click - function="ShowFloater" - parameter="about" /> + function="World.EnvSettings" + parameter="default" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_call + label="Environment Editor" + name="Environment Editor"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="editor" /> </menu_item_call> </menu> </menu> <menu create_jump_keys="true" - label="Tools" - layout="topleft" + label="Build" name="BuildTools" tear_off="true" - visible="false"> + visible="true"> + <menu_item_check + label="Build" + name="Show Build Tools" + shortcut="control|B"> + <menu_item_check.on_check + function="Build.Active" /> + <menu_item_check.on_click + function="Build.Toggle" /> + <menu_item_check.on_enable + function="Build.Enabled" /> + </menu_item_check> + <menu + create_jump_keys="true" + label="Select Build Tool" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + <menu_item_call + label="Link" + name="Link" + shortcut="control|L"> + <menu_item_call.on_click + function="Tools.Link" /> + <menu_item_call.on_enable + function="Tools.EnableLink" /> + </menu_item_call> + <menu_item_call + label="Unlink" + name="Unlink" + shortcut="control|shift|L"> + <menu_item_call.on_click + function="Tools.Unlink" /> + <menu_item_call.on_enable + function="Tools.EnableUnlink" /> + </menu_item_call> + <menu_item_check + label="Edit Linked Parts" + name="Edit Linked Parts"> + <menu_item_check.on_check + control="EditLinkedParts" /> + <menu_item_check.on_click + function="Tools.EditLinkedParts" + parameter="EditLinkedParts" /> + <menu_item_check.on_enable + function="Tools.EnableToolNotPie" /> + </menu_item_check> <menu create_jump_keys="true" - label="Edit" - layout="topleft" - name="Edit" + label="Select Linked Parts" + name="Select Linked Parts" tear_off="true"> <menu_item_call - label="Undo" - layout="topleft" - name="Undo" - shortcut="control|Z"> - <menu_item_call.on_click - function="Edit.Undo" /> - <menu_item_call.on_enable - function="Edit.EnableUndo" /> - </menu_item_call> - <menu_item_call - label="Redo" - layout="topleft" - name="Redo" - shortcut="control|Y"> - <menu_item_call.on_click - function="Edit.Redo" /> - <menu_item_call.on_enable - function="Edit.EnableRedo" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Cut" - layout="topleft" - name="Cut" - shortcut="control|X"> - <menu_item_call.on_click - function="Edit.Cut" /> - <menu_item_call.on_enable - function="Edit.EnableCut" /> - </menu_item_call> - <menu_item_call - label="Copy" - layout="topleft" - name="Copy" - shortcut="control|C"> + label="Select Next Part" + name="Select Next Part" + shortcut="control|."> <menu_item_call.on_click - function="Edit.Copy" /> + function="Tools.SelectNextPart" + parameter="next" /> <menu_item_call.on_enable - function="Edit.EnableCopy" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Paste" - layout="topleft" - name="Paste" - shortcut="control|V"> + label="Select Previous Part" + name="Select Previous Part" + shortcut="control|,"> <menu_item_call.on_click - function="Edit.Paste" /> + function="Tools.SelectNextPart" + parameter="previous" /> <menu_item_call.on_enable - function="Edit.EnablePaste" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Delete" - layout="topleft" - name="Delete" - shortcut="Del"> + label="Include Next Part" + name="Include Next Part" + shortcut="control|shift|."> <menu_item_call.on_click - function="Edit.Delete" /> + function="Tools.SelectNextPart" + parameter="includenext" /> <menu_item_call.on_enable - function="Edit.EnableDelete" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Duplicate" - layout="topleft" - name="Duplicate" - shortcut="control|D"> - <menu_item_call.on_click - function="Edit.Duplicate" /> - <menu_item_call.on_enable - function="Edit.EnableDuplicate" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Select All" - layout="topleft" - name="Select All" - shortcut="control|A"> + label="Include Previous Part" + name="Include Previous Part" + shortcut="control|shift|,"> <menu_item_call.on_click - function="Edit.SelectAll" /> + function="Tools.SelectNextPart" + parameter="includeprevious" /> <menu_item_call.on_enable - function="Edit.EnableSelectAll" /> - </menu_item_call> - <menu_item_call - label="Deselect" - layout="topleft" - name="Deselect" - shortcut="control|E"> - <menu_item_call.on_click - function="Edit.Deselect" /> - <menu_item_call.on_enable - function="Edit.EnableDeselect" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> </menu> + <menu_item_separator/> + + <menu_item_call + label="Focus on Selection" + name="Focus on Selection" + shortcut="H"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="focus" /> + <menu_item_call.on_enable + function="Tools.SomethingSelectedNoHUD" /> + </menu_item_call> + <menu_item_call + label="Zoom to Selection" + name="Zoom to Selection" + shortcut="shift|H"> + <menu_item_call.on_click + function="Tools.LookAtSelection" + parameter="zoom" /> + <menu_item_call.on_enable + function="Tools.SomethingSelectedNoHUD" /> + </menu_item_call> + + <menu_item_separator/> + + <menu + create_jump_keys="true" + label="Object" + name="Object" + tear_off="true"> + <menu_item_call + label="Buy" + name="Menu Object Buy"> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleBuyObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> + </menu_item_call> + <menu_item_call + label="Take" + name="Menu Object Take"> + <menu_item_call.on_click + function="Tools.BuyOrTake"/> + <menu_item_call.on_visible + function="Tools.VisibleTakeObject"/> + <menu_item_call.on_enable + function="Tools.EnableBuyOrTake"/> + </menu_item_call> + <menu_item_call + label="Take Copy" + name="Take Copy"> + <menu_item_call.on_click + function="Tools.TakeCopy" /> + <menu_item_call.on_enable + function="Tools.EnableTakeCopy" /> + </menu_item_call> + <menu_item_call + label="Save Back to My Inventory" + name="Save Object Back to My Inventory"> + <menu_item_call.on_click + function="Tools.SaveToInventory" /> + <menu_item_call.on_enable + function="Tools.EnableSaveToInventory" /> + </menu_item_call> + <menu_item_call + label="Save Back to Object Contents" + name="Save Object Back to Object Contents"> + <menu_item_call.on_click + function="Tools.SaveToObjectInventory" /> + <menu_item_call.on_enable + function="Tools.EnableSaveToObjectInventory" /> + </menu_item_call> + <menu_item_call + label="Return Object" + name="Return Object back to Owner"> + <menu_item_call.on_click + function="Object.Return" /> + <menu_item_call.on_enable + function="Object.EnableReturn" /> + </menu_item_call> + </menu> + <menu + create_jump_keys="true" + label="Scripts" + name="Scripts" + tear_off="true"> + <menu_item_call + label="Recompile Scripts (Mono)" + name="Mono"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="compile mono" /> + <menu_item_call.on_enable + function="EditableSelectedMono" /> + </menu_item_call> + <menu_item_call + label="Recompile Scripts (LSL)" + name="LSL"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="compile lsl" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Reset Scripts" + name="Reset Scripts"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="reset" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Set Scripts to Running" + name="Set Scripts to Running"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="start" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + <menu_item_call + label="Set Scripts to Not Running" + name="Set Scripts to Not Running"> + <menu_item_call.on_click + function="Tools.SelectedScriptAction" + parameter="stop" /> + <menu_item_call.on_enable + function="EditableSelected" /> + </menu_item_call> + </menu> + + <menu_item_separator/> + <menu create_jump_keys="true" label="Options" - layout="topleft" name="Options" tear_off="true"> + <menu_item_check + label="Show Advanced Permissions" + name="DebugPermissions"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugPermissions" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugPermissions" /> + </menu_item_check> + + <menu_item_separator/> + <menu_item_check - label="Edit Linked Parts" - layout="topleft" - name="Edit Linked Parts"> - <menu_item_check.on_check - control="EditLinkedParts" /> - <menu_item_check.on_click - function="Tools.EditLinkedParts" - parameter="EditLinkedParts" /> - <menu_item_check.on_enable - function="Tools.EnableToolNotPie" /> - </menu_item_check> - <menu_item_call - label="Set Default Permissions" - layout="topleft" - name="perm prefs"> - <menu_item_call.on_click - function="ShowFloater" - parameter="perm prefs" /> - </menu_item_call> - <menu_item_call - label="Show Script Warning/Error Window" - layout="topleft" - name="Show Script Warning/Error Window"> - <menu_item_call.on_click - function="ShowFloater" - parameter="script errors" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Selection" - layout="topleft" - name="Selection" - tear_off="true"> - <menu_item_check label="Select Only My Objects" - layout="topleft" name="Select Only My Objects"> <menu_item_check.on_check control="SelectOwnedOnly" /> @@ -604,7 +762,6 @@ </menu_item_check> <menu_item_check label="Select Only Movable Objects" - layout="topleft" name="Select Only Movable Objects"> <menu_item_check.on_check control="SelectMovableOnly" /> @@ -614,23 +771,27 @@ </menu_item_check> <menu_item_check label="Select By Surrounding" - layout="topleft" name="Select By Surrounding"> <menu_item_check.on_check control="RectangleSelectInclusive" /> <menu_item_check.on_click function="Tools.SelectBySurrounding" /> + </menu_item_check> + + <menu_item_separator/> + + <menu_item_check + label="Show Selection Outlines" + name="Show Selection Outlines"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderHighlightSelections" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderHighlightSelections" /> </menu_item_check> - </menu> - <menu - create_jump_keys="true" - label="Show" - layout="topleft" - name="Show" - tear_off="true"> <menu_item_check label="Show Hidden Selection" - layout="topleft" name="Show Hidden Selection"> <menu_item_check.on_check control="RenderHiddenSelections" /> @@ -639,7 +800,6 @@ </menu_item_check> <menu_item_check label="Show Light Radius for Selection" - layout="topleft" name="Show Light Radius for Selection"> <menu_item_check.on_check control="RenderLightRadius" /> @@ -648,7 +808,6 @@ </menu_item_check> <menu_item_check label="Show Selection Beam" - layout="topleft" name="Show Selection Beam"> <menu_item_check.on_check control="ShowSelectionBeam" /> @@ -656,16 +815,11 @@ function="ToggleControl" parameter="ShowSelectionBeam" /> </menu_item_check> - </menu> - <menu - create_jump_keys="true" - label="Grid" - layout="topleft" - name="Grid" - tear_off="true"> + + <menu_item_separator/> + <menu_item_check label="Snap to Grid" - layout="topleft" name="Snap to Grid" shortcut="G"> <menu_item_check.on_check @@ -678,7 +832,6 @@ </menu_item_check> <menu_item_call label="Snap Object XY to Grid" - layout="topleft" name="Snap Object XY to Grid" shortcut="shift|X"> <menu_item_call.on_click @@ -688,7 +841,6 @@ </menu_item_call> <menu_item_call label="Use Selection for Grid" - layout="topleft" name="Use Selection for Grid" shortcut="shift|G"> <menu_item_call.on_click @@ -698,485 +850,170 @@ </menu_item_call> <menu_item_call label="Grid Options" - layout="topleft" name="Grid Options" shortcut="control|shift|B"> <menu_item_call.on_click - function="ShowFloater" - parameter="grid options" /> + function="Floater.Show" + parameter="build_options" /> <menu_item_call.on_enable function="Tools.EnableToolNotPie" /> </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="Beacons" - layout="topleft" - name="Beacons" - tear_off="true"> - <menu_item_check - label="Beacons" - layout="topleft" - name="beacons" - shortcut="control|alt|shift|N"> - <menu_item_check.on_check - function="FloaterVisible" - parameter="beacons" /> - <menu_item_check.on_click - function="ShowFloater" - parameter="beacons" /> - </menu_item_check> - <menu_item_check - label="Cheesy Beacon" - layout="topleft" - name="Cheesy Beacon"> - <menu_item_check.on_check - function="CheckControl" - parameter="CheesyBeacon" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="CheesyBeacon" /> - </menu_item_check> - </menu> - <menu - create_jump_keys="true" - label="Land" - layout="topleft" - name="Land" - tear_off="true"> - <menu_item_check - label="Property Lines" - layout="topleft" - name="Property Lines" - shortcut="control|alt|shift|P"> - <menu_item_check.on_check - control="ShowPropertyLines" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowPropertyLines" /> - </menu_item_check> - <menu_item_check - label="Land Owners" - layout="topleft" - name="Land Owners"> - <menu_item_check.on_check - control="ShowParcelOwners" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowParcelOwners" /> - </menu_item_check> - <menu_item_check - label="Ban Lines" - layout="topleft" - name="Ban Lines"> - <menu_item_check.on_check - control="ShowBanLines" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBanLines" /> - </menu_item_check> - </menu> </menu> <menu create_jump_keys="true" - label="Actions" + label="Upload" layout="topleft" - name="Actions" + name="Upload" tear_off="true"> <menu_item_call - label="Link" - layout="topleft" - name="Link" - shortcut="control|L"> - <menu_item_call.on_click - function="Tools.Link" /> - <menu_item_call.on_enable - function="Tools.EnableLink" /> - </menu_item_call> - <menu_item_call - label="Unlink" - layout="topleft" - name="Unlink" - shortcut="control|shift|L"> - <menu_item_call.on_click - function="Tools.Unlink" /> - <menu_item_call.on_enable - function="Tools.EnableUnlink" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Focus on Selection" - layout="topleft" - name="Focus on Selection" - shortcut="H"> - <menu_item_call.on_click - function="Tools.LookAtSelection" - parameter="focus" /> - <menu_item_call.on_enable - function="Tools.SomethingSelectedNoHUD" /> - </menu_item_call> - <menu_item_call - label="Zoom to Selection" + label="Image (L$[COST])..." layout="topleft" - name="Zoom to Selection" - shortcut="shift|H"> + name="Upload Image" + shortcut="control|U"> <menu_item_call.on_click - function="Tools.LookAtSelection" - parameter="zoom" /> - <menu_item_call.on_enable - function="Tools.SomethingSelectedNoHUD" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Buy Object" - layout="topleft" - name="Menu Object Take" - visible="false"> - <menu_item_call.on_click - function="Tools.BuyOrTake" /> - <menu_item_call.on_enable - function="Tools.EnableBuyOrTake" - parameter="Buy,Take" /> - </menu_item_call> - <menu_item_call - label="Take Copy" - layout="topleft" - name="Take Copy"> - <menu_item_call.on_click - function="Tools.TakeCopy" /> - <menu_item_call.on_enable - function="Tools.EnableTakeCopy" /> - </menu_item_call> - <menu_item_call - label="Save Object Back to My Inventory" - layout="topleft" - name="Save Object Back to My Inventory"> - <menu_item_call.on_click - function="Tools.SaveToInventory" /> + function="File.UploadImage" + parameter="" /> <menu_item_call.on_enable - function="Tools.EnableSaveToInventory" /> + function="File.EnableUpload" /> + <menu_item_call.on_visible + function="Upload.CalculateCosts" + parameter="Upload Image" /> </menu_item_call> <menu_item_call - label="Save Object Back to Object Contents" + label="Sound (L$[COST])..." layout="topleft" - name="Save Object Back to Object Contents"> + name="Upload Sound"> <menu_item_call.on_click - function="Tools.SaveToObjectInventory" /> + function="File.UploadSound" + parameter="" /> <menu_item_call.on_enable - function="Tools.EnableSaveToObjectInventory" /> + function="File.EnableUpload" /> + <menu_item_call.on_visible + function="Upload.CalculateCosts" + parameter="Upload Sound" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Recompile Scripts in Selection" - layout="topleft" - name="Recompile Scripts in Selection" - tear_off="true"> - <menu_item_call - label="Mono" - layout="topleft" - name="Mono"> - <menu_item_call.on_click - function="Tools.SelectedScriptAction" - parameter="compile mono" /> - <menu_item_call.on_enable - function="EditableSelectedMono" /> - </menu_item_call> - <menu_item_call - label="LSL" - layout="topleft" - name="LSL"> - <menu_item_call.on_click - function="Tools.SelectedScriptAction" - parameter="compile lsl" /> - <menu_item_call.on_enable - function="EditableSelected" /> - </menu_item_call> - </menu> <menu_item_call - label="Reset Scripts in Selection" + label="Animation (L$[COST])..." layout="topleft" - name="Reset Scripts in Selection"> + name="Upload Animation"> <menu_item_call.on_click - function="Tools.SelectedScriptAction" - parameter="reset" /> + function="File.UploadAnim" + parameter="" /> <menu_item_call.on_enable - function="EditableSelected" /> + function="File.EnableUpload" /> + <menu_item_call.on_visible + function="Upload.CalculateCosts" + parameter="Upload Animation" /> </menu_item_call> <menu_item_call - label="Set Scripts to Running in Selection" + label="Bulk (L$[COST] per file)..." layout="topleft" - name="Set Scripts to Running in Selection"> + name="Bulk Upload"> <menu_item_call.on_click - function="Tools.SelectedScriptAction" - parameter="start" /> - <menu_item_call.on_enable - function="EditableSelected" /> + function="File.UploadBulk" + parameter="" /> </menu_item_call> <menu_item_call - label="Set Scripts to Not Running in Selection" - layout="topleft" - name="Set Scripts to Not Running in Selection"> + label="Set Default Upload Permissions" + name="perm prefs"> <menu_item_call.on_click - function="Tools.SelectedScriptAction" - parameter="stop" /> - <menu_item_call.on_enable - function="EditableSelected" /> + function="Floater.Toggle" + parameter="perm_prefs" /> </menu_item_call> </menu> </menu> <menu - label="Geek" - layout="topleft" - name="Advanced" - tear_off="true" - visible="false"> - <menu - label="Shortcuts" - layout="topleft" - name="Shortcuts" - tear_off="true" - visible="false"> - <menu_item_call - enabled="false" - label="Release Keys" - layout="topleft" - name="Release Keys"> - <menu_item_call.on_click - function="Tools.ReleaseKeys" - parameter="" /> - <menu_item_call.on_enable - function="Tools.EnableReleaseKeys" - parameter="" /> - </menu_item_call> - <menu_item_call - label="Set UI Size to Default" - layout="topleft" - name="Set UI Size to Default"> - <menu_item_call.on_click - function="View.DefaultUISize" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Always Run" - layout="topleft" - name="Always Run" - shortcut="control|R"> - <menu_item_check.on_check - function="World.CheckAlwaysRun" /> - <menu_item_check.on_click - function="World.AlwaysRun" /> - </menu_item_check> - <menu_item_check - control_name="FlyBtnState" - label="Fly" - layout="topleft" - name="Fly" - shortcut="Home"> - <menu_item_check.on_click - function="Agent.toggleFlying" /> - <menu_item_check.on_enable - function="Agent.enableFlying" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Close Window" - layout="topleft" - name="Close Window" - shortcut="control|W"> - <menu_item_call.on_click - function="File.CloseWindow" /> - <menu_item_call.on_enable - function="File.EnableCloseWindow" /> - </menu_item_call> - <menu_item_call - label="Close All Windows" - layout="topleft" - name="Close All Windows" - shortcut="control|shift|W"> - <menu_item_call.on_click - function="File.CloseAllWindows" /> - <menu_item_call.on_enable - function="File.EnableCloseAllWindows" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Snapshot to Disk" - layout="topleft" - name="Snapshot to Disk" - shortcut="control|`" - use_mac_ctrl="true"> - <menu_item_call.on_click - function="File.TakeSnapshotToDisk" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Mouselook" - layout="topleft" - name="Mouselook" - shortcut="M"> - <menu_item_call.on_click - function="View.Mouselook" /> - <menu_item_call.on_enable - function="View.EnableMouselook" /> - </menu_item_call> - <menu_item_check - label="Joystick Flycam" - layout="topleft" - name="Joystick Flycam" - shortcut="alt|shift|F"> - <menu_item_check.on_check - function="View.CheckJoystickFlycam" /> - <menu_item_check.on_click - function="View.JoystickFlycam" /> - <menu_item_check.on_enable - function="View.EnableJoystickFlycam" /> - </menu_item_check> - <menu_item_call - label="Reset View" - layout="topleft" - name="Reset View" - shortcut="Esc"> - <menu_item_call.on_click - function="View.ResetView" /> - </menu_item_call> - <menu_item_call - label="Look at Last Chatter" - layout="topleft" - name="Look at Last Chatter" - shortcut="control|\"> - <menu_item_call.on_click - function="View.LookAtLastChatter" /> - <menu_item_call.on_enable - function="View.EnableLastChatter" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Select Tool" - layout="topleft" - name="Select Tool" - tear_off="true"> - <menu_item_call - label="Focus" - layout="topleft" - name="Focus" - shortcut="control|1"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="focus" /> - </menu_item_call> - <menu_item_call - label="Move" - layout="topleft" - name="Move" - shortcut="control|2"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="move" /> - </menu_item_call> - <menu_item_call - label="Edit" - layout="topleft" - name="Edit" - shortcut="control|3"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Create" - layout="topleft" - name="Create" - shortcut="control|4"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="create" /> - </menu_item_call> - <menu_item_call - label="Land" - layout="topleft" - name="Land" - shortcut="control|5"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="land" /> - </menu_item_call> - </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Zoom In" - layout="topleft" - name="Zoom In" - shortcut="control|0"> - <menu_item_call.on_click - function="View.ZoomIn" /> - </menu_item_call> - <menu_item_call - label="Zoom Default" - layout="topleft" - name="Zoom Default" - shortcut="control|9"> - <menu_item_call.on_click - function="View.ZoomDefault" /> - </menu_item_call> - <menu_item_call - label="Zoom Out" - layout="topleft" - name="Zoom Out" - shortcut="control|8"> + create_jump_keys="true" + label="Help" + name="Help" + tear_off="true"> + <menu_item_call + label="[SECOND_LIFE] Help" + name="Second Life Help" + shortcut="F1"> + <menu_item_call.on_click + function="ShowHelp" + parameter="f1_help" /> + </menu_item_call> +<!-- <menu_item_call + label="Tutorial" + name="Tutorial"> + <menu_item_call.on_click + function="Floater.Show" + parameter="hud" /> + </menu_item_call>--> + + <menu_item_separator/> + + <menu_item_call + label="Report Abuse" + name="Report Abuse"> <menu_item_call.on_click - function="View.ZoomOut" /> + function="ReportAbuse" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Toggle Fullscreen" - layout="topleft" - name="Toggle Fullscreen" - shortcut="alt|Enter"> + <menu_item_call + label="Report Bug" + name="Report Bug"> <menu_item_call.on_click - function="View.Fullscreen" /> + function="ShowHelp" + parameter="report_bug" /> </menu_item_call> - </menu> + + <menu_item_separator/> + + <menu_item_call + label="About [APP_NAME]" + name="About Second Life"> + <menu_item_call.on_click + function="Floater.Show" + parameter="sl_about" /> + </menu_item_call> <menu_item_check - label="Go Away/AFK When Idle" - layout="topleft" - name="Go Away/AFK When Idle"> - <menu_item_check.on_check - function="CheckControl" - parameter="AllowIdleAFK" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="AllowIdleAFK" /> + label="Enable Hints" + name="Enable Hints"> + <on_check + control="EnableUIHints"/> + <on_click + function="ToggleUIHints"/> </menu_item_check> + </menu> + <menu + create_jump_keys="true" + label="Advanced" + name="Advanced" + tear_off="true" + visible="false"> <menu_item_call - label="Stop Animating My Avatar" - layout="topleft" + label="Stop Animating Me" name="Stop Animating My Avatar"> <menu_item_call.on_click function="Tools.StopAllAnimations" /> </menu_item_call> <menu_item_call - label="Rebake Texture" - layout="topleft" + label="Rebake Textures" name="Rebake Texture" shortcut="control|alt|R"> <menu_item_call.on_click function="Advanced.RebakeTextures" /> </menu_item_call> + <menu_item_call + label="Set UI Size to Default" + name="Set UI Size to Default"> + <menu_item_call.on_click + function="View.DefaultUISize" /> + </menu_item_call> + <menu_item_call + label="Set Window Size..." + name="Set Window Size..."> + <menu_item_call.on_click + function="Floater.Show" + parameter="window_size" /> + </menu_item_call> + + <menu_item_separator/> + <menu_item_check label="Limit Select Distance" - layout="topleft" name="Limit Select Distance"> <menu_item_check.on_check function="CheckControl" @@ -1187,7 +1024,6 @@ </menu_item_check> <menu_item_check label="Disable Camera Constraints" - layout="topleft" name="Disable Camera Distance"> <menu_item_check.on_check function="CheckControl" @@ -1196,11 +1032,11 @@ function="ToggleControl" parameter="DisableCameraConstraints" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_check label="High-res Snapshot" - layout="topleft" name="HighResSnapshot"> <menu_item_check.on_check function="CheckControl" @@ -1211,7 +1047,6 @@ </menu_item_check> <menu_item_check label="Quiet Snapshots to Disk" - layout="topleft" name="QuietSnapshotsToDisk"> <menu_item_check.on_check function="CheckControl" @@ -1222,7 +1057,6 @@ </menu_item_check> <menu_item_check label="Compress Snapshots to Disk" - layout="topleft" name="CompressSnapshotsToDisk"> <menu_item_check.on_check function="CheckControl" @@ -1231,93 +1065,23 @@ function="ToggleControl" parameter="CompressSnapshotsToDisk" /> </menu_item_check> - <menu_item_call - label="Save Texture As..." - layout="topleft" - name="Save Texture As"> - <menu_item_call.on_click - function="File.SaveTexture" /> - <menu_item_call.on_enable - function="File.EnableSaveAs" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Environment Settings" - layout="topleft" - name="Environment Settings" - tear_off="true"> - <menu_item_call - label="Sunrise" - layout="topleft" - name="Sunrise"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="sunrise" /> - </menu_item_call> - <menu_item_call - label="Midday" - layout="topleft" - name="Noon" - shortcut="control|shift|Y"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="noon" /> - </menu_item_call> - <menu_item_call - label="Sunset" - layout="topleft" - name="Sunset" - shortcut="control|shift|N"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="sunset" /> - </menu_item_call> - <menu_item_call - label="Midnight" - layout="topleft" - name="Midnight"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="midnight" /> - </menu_item_call> - <menu_item_call - label="Revert to Region Default" - layout="topleft" - name="Revert to Region Default"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="default" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Environment Editor" - layout="topleft" - name="Environment Editor"> - <menu_item_call.on_click - function="World.EnvSettings" - parameter="editor" /> - </menu_item_call> - </menu> + + <menu_item_separator/> + <menu create_jump_keys="true" label="Performance Tools" - layout="topleft" name="Performance Tools" tear_off="true"> <menu_item_call label="Lag Meter" - layout="topleft" name="Lag Meter"> <menu_item_call.on_click - function="ShowFloater" - parameter="lag meter" /> + function="Floater.Show" + parameter="lagmeter" /> </menu_item_call> <menu_item_check label="Statistics Bar" - layout="topleft" name="Statistics Bar" shortcut="control|shift|1"> <menu_item_check.on_check @@ -1327,26 +1091,34 @@ function="Floater.Toggle" parameter="stats" /> </menu_item_check> + <menu_item_check + label="Show Avatar Rendering Cost" + name="Avatar Rendering Cost"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="shame" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="shame" /> + </menu_item_check> </menu> <menu create_jump_keys="true" label="Highlighting and Visibility" - layout="topleft" name="Highlighting and Visibility" tear_off="true"> - <menu_item_check - label="Highlight Transparent" - layout="topleft" - name="Highlight Transparent" - shortcut="control|alt|T"> - <menu_item_check.on_check - function="View.CheckHighlightTransparent" /> - <menu_item_check.on_click - function="View.HighlightTransparent" /> - </menu_item_check> + <menu_item_check + label="Cheesy Beacon" + name="Cheesy Beacon"> + <menu_item_check.on_check + function="CheckControl" + parameter="CheesyBeacon" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="CheesyBeacon" /> + </menu_item_check> <menu_item_check label="Hide Particles" - layout="topleft" name="Hide Particles" shortcut="control|alt|shift|="> <menu_item_check.on_check @@ -1357,18 +1129,7 @@ parameter="hideparticles" /> </menu_item_check> <menu_item_check - label="Show HUD Attachments" - layout="topleft" - name="Show HUD Attachments" - shortcut="alt|shift|H"> - <menu_item_check.on_check - function="View.CheckHUDAttachments" /> - <menu_item_check.on_click - function="View.ShowHUDAttachments" /> - </menu_item_check> - <menu_item_check label="Hide Selected" - layout="topleft" name="Hide Selected"> <menu_item_check.on_check function="CheckControl" @@ -1378,8 +1139,25 @@ parameter="HideSelectedObjects" /> </menu_item_check> <menu_item_check + label="Highlight Transparent" + name="Highlight Transparent" + shortcut="control|alt|T"> + <menu_item_check.on_check + function="View.CheckHighlightTransparent" /> + <menu_item_check.on_click + function="View.HighlightTransparent" /> + </menu_item_check> + <menu_item_check + label="Show HUD Attachments" + name="Show HUD Attachments" + shortcut="alt|shift|H"> + <menu_item_check.on_check + function="View.CheckHUDAttachments" /> + <menu_item_check.on_click + function="View.ShowHUDAttachments" /> + </menu_item_check> + <menu_item_check label="Show Mouselook Crosshairs" - layout="topleft" name="ShowCrosshairs"> <menu_item_check.on_check function="CheckControl" @@ -1388,16 +1166,13 @@ function="ToggleControl" parameter="ShowCrosshairs" /> </menu_item_check> - </menu> - <menu + <!-- <menu create_jump_keys="true" label="Hover Tips" - layout="topleft" name="Hover Tips" tear_off="true"> <menu_item_check label="Show Tips" - layout="topleft" name="Show Tips" shortcut="control|shift|T"> <menu_item_check.on_check @@ -1405,11 +1180,11 @@ <menu_item_check.on_click function="View.ShowHoverTips" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_check - label="Land Tips" - layout="topleft" + label="Show Land Tooltips" name="Land Tips"> <menu_item_check.on_check control="ShowLandHoverTip" /> @@ -1419,9 +1194,8 @@ <menu_item_check.on_enable function="View.CheckShowHoverTips" /> </menu_item_check> - <menu_item_check - label="Tips On All Objects" - layout="topleft" + <menu_item_check + label="Show Tips On All Objects" name="Tips On All Objects"> <menu_item_check.on_check control="ShowAllObjectHoverTip" /> @@ -1431,31 +1205,17 @@ <menu_item_check.on_enable function="View.CheckShowHoverTips" /> </menu_item_check> + </menu>--> + </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Run Multiple Threads" - layout="topleft" - name="Run Multiple Threads"> - <menu_item_check.on_check - function="CheckControl" - parameter="RunMultipleThreads" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="RunMultipleThreads" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> + <menu create_jump_keys="true" label="Rendering Types" - layout="topleft" name="Rendering Types" tear_off="true"> <menu_item_check label="Simple" - layout="topleft" name="Simple" shortcut="control|alt|shift|1"> <menu_item_check.on_check @@ -1467,7 +1227,6 @@ </menu_item_check> <menu_item_check label="Alpha" - layout="topleft" name="Alpha" shortcut="control|alt|shift|2"> <menu_item_check.on_check @@ -1479,7 +1238,6 @@ </menu_item_check> <menu_item_check label="Tree" - layout="topleft" name="Tree" shortcut="control|alt|shift|3"> <menu_item_check.on_check @@ -1490,8 +1248,7 @@ parameter="tree" /> </menu_item_check> <menu_item_check - label="Character" - layout="topleft" + label="Avatars" name="Character" shortcut="control|alt|shift|4"> <menu_item_check.on_check @@ -1503,7 +1260,6 @@ </menu_item_check> <menu_item_check label="SurfacePath" - layout="topleft" name="SurfacePath" shortcut="control|alt|shift|5"> <menu_item_check.on_check @@ -1515,7 +1271,6 @@ </menu_item_check> <menu_item_check label="Sky" - layout="topleft" name="Sky" shortcut="control|alt|shift|6"> <menu_item_check.on_check @@ -1527,7 +1282,6 @@ </menu_item_check> <menu_item_check label="Water" - layout="topleft" name="Water" shortcut="control|alt|shift|7"> <menu_item_check.on_check @@ -1539,7 +1293,6 @@ </menu_item_check> <menu_item_check label="Ground" - layout="topleft" name="Ground" shortcut="control|alt|shift|8"> <menu_item_check.on_check @@ -1551,7 +1304,6 @@ </menu_item_check> <menu_item_check label="Volume" - layout="topleft" name="Volume" shortcut="control|alt|shift|9"> <menu_item_check.on_check @@ -1563,7 +1315,6 @@ </menu_item_check> <menu_item_check label="Grass" - layout="topleft" name="Grass" shortcut="control|alt|shift|0"> <menu_item_check.on_check @@ -1575,7 +1326,6 @@ </menu_item_check> <menu_item_check label="Clouds" - layout="topleft" name="Clouds" shortcut="control|alt|shift|-"> <menu_item_check.on_check @@ -1587,7 +1337,6 @@ </menu_item_check> <menu_item_check label="Particles" - layout="topleft" name="Particles" shortcut="control|alt|shift|="> <menu_item_check.on_check @@ -1599,7 +1348,6 @@ </menu_item_check> <menu_item_check label="Bump" - layout="topleft" name="Bump" shortcut="control|alt|shift|\"> <menu_item_check.on_check @@ -1613,12 +1361,10 @@ <menu create_jump_keys="true" label="Rendering Features" - layout="topleft" name="Rendering Features" tear_off="true"> <menu_item_check label="UI" - layout="topleft" name="UI" shortcut="control|alt|F1"> <menu_item_check.on_check @@ -1630,7 +1376,6 @@ </menu_item_check> <menu_item_check label="Selected" - layout="topleft" name="Selected" shortcut="control|alt|F2"> <menu_item_check.on_check @@ -1642,7 +1387,6 @@ </menu_item_check> <menu_item_check label="Highlighted" - layout="topleft" name="Highlighted" shortcut="control|alt|F3"> <menu_item_check.on_check @@ -1654,7 +1398,6 @@ </menu_item_check> <menu_item_check label="Dynamic Textures" - layout="topleft" name="Dynamic Textures" shortcut="control|alt|F4"> <menu_item_check.on_check @@ -1666,7 +1409,6 @@ </menu_item_check> <menu_item_check label="Foot Shadows" - layout="topleft" name="Foot Shadows" shortcut="control|alt|F5"> <menu_item_check.on_check @@ -1678,7 +1420,6 @@ </menu_item_check> <menu_item_check label="Fog" - layout="topleft" name="Fog" shortcut="control|alt|F6"> <menu_item_check.on_check @@ -1690,7 +1431,6 @@ </menu_item_check> <menu_item_check label="Test FRInfo" - layout="topleft" name="Test FRInfo" shortcut="control|alt|F8"> <menu_item_check.on_check @@ -1702,7 +1442,6 @@ </menu_item_check> <menu_item_check label="Flexible Objects" - layout="topleft" name="Flexible Objects" shortcut="control|alt|F9"> <menu_item_check.on_check @@ -1712,136 +1451,305 @@ function="Advanced.ToggleFeature" parameter="flexible" /> </menu_item_check> - </menu> - <menu_item_separator - layout="topleft" /> + </menu> + <menu_item_check + label="Use Plugin Read Thread" + name="Use Plugin Read Thread"> + <menu_item_check.on_check + function="CheckControl" + parameter="PluginUseReadThread" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="PluginUseReadThread" /> + </menu_item_check> + <menu_item_call + label="Clear Group Cache" + name="ClearGroupCache"> + <menu_item_call.on_click + function="Advanced.ClearGroupCache" + parameter="ClearGroupCache" /> + </menu_item_call> + <menu_item_check + label="Mouse Smoothing" + name="Mouse Smoothing"> + <menu_item_check.on_check + function="CheckControl" + parameter="MouseSmooth" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="MouseSmooth" /> + </menu_item_check> + + <menu_item_separator/> + <menu create_jump_keys="true" - label="Recorder" - layout="topleft" - name="Recorder" - tear_off="true"> + label="Shortcuts" + name="Shortcuts" + tear_off="true" + visible="false"> + <menu_item_call + label="Image (L$[COST])..." + name="Upload Image" + shortcut="control|U"> + <menu_item_call.on_click + function="File.UploadImage" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_check + label="Search" + name="Search" + shortcut="control|F"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="search" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="search" /> + </menu_item_check> <menu_item_call - label="Start Playback" - layout="topleft" - name="Start Playback"> + enabled="false" + label="Release Keys" + name="Release Keys"> <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="start playback" /> + function="Tools.ReleaseKeys" + parameter="" /> + <menu_item_call.on_enable + function="Tools.EnableReleaseKeys" + parameter="" /> </menu_item_call> <menu_item_call - label="Stop Playback" - layout="topleft" - name="Stop Playback"> + label="Set UI Size to Default" + name="Set UI Size to Default"> <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="stop playback" /> + function="View.DefaultUISize" /> </menu_item_call> + + <menu_item_separator/> + <menu_item_check - label="Loop Playback" - layout="topleft" - name="Loop Playback"> + label="Always Run" + name="Always Run" + shortcut="control|R"> <menu_item_check.on_check - function="Advanced.CheckAgentPilotLoop" - parameter="loopPlayback" /> + function="World.CheckAlwaysRun" /> <menu_item_check.on_click - function="Advanced.ToggleAgentPilotLoop" /> + function="World.AlwaysRun" /> </menu_item_check> + <menu_item_check + label="Fly" + name="Fly" + shortcut="Home"> + <menu_item_check.on_check + function="Agent.getFlying" /> + <menu_item_check.on_click + function="Agent.toggleFlying" /> + <menu_item_check.on_enable + function="Agent.enableFlying" /> + </menu_item_check> + + <menu_item_separator/> + <menu_item_call - label="Start Record" - layout="topleft" - name="Start Record"> + label="Close Window" + name="Close Window" + shortcut="control|W"> <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="start record" /> + function="File.CloseWindow" /> + <menu_item_call.on_enable + function="File.EnableCloseWindow" /> </menu_item_call> <menu_item_call - label="Stop Record" - layout="topleft" - name="Stop Record"> + label="Close All Windows" + name="Close All Windows" + shortcut="control|shift|W"> <menu_item_call.on_click - function="Advanced.AgentPilot" - parameter="stop record" /> + function="File.CloseAllWindows" /> + <menu_item_call.on_enable + function="File.EnableCloseAllWindows" /> </menu_item_call> - </menu> - <menu_item_call - label="Dump Scripted Camera" - layout="topleft" - name="Dump Scripted Camera"> - <menu_item_call.on_click - function="Advanced.DumpScriptedCamera" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + + <menu_item_call + label="Snapshot to Disk" + name="Snapshot to Disk" + shortcut="control|`" + use_mac_ctrl="true"> + <menu_item_call.on_click + function="File.TakeSnapshotToDisk" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_call + label="Mouselook" + name="Mouselook" + shortcut="M"> + <menu_item_call.on_click + function="View.Mouselook" /> + <menu_item_call.on_enable + function="View.EnableMouselook" /> + </menu_item_call> + <menu_item_check + label="Joystick Flycam" + name="Joystick Flycam" + shortcut="alt|shift|F"> + <menu_item_check.on_check + function="View.CheckJoystickFlycam" /> + <menu_item_check.on_click + function="View.JoystickFlycam" /> + <menu_item_check.on_enable + function="View.EnableJoystickFlycam" /> + </menu_item_check> + <menu_item_call + label="Reset View" + name="Reset View" + shortcut="Esc"> + <menu_item_call.on_click + function="View.ResetView" /> + </menu_item_call> + <menu_item_call + label="Look at Last Chatter" + name="Look at Last Chatter" + shortcut="control|\"> + <menu_item_call.on_click + function="View.LookAtLastChatter" /> + <menu_item_call.on_enable + function="View.EnableLastChatter" /> + </menu_item_call> + + <menu_item_separator/> + + <menu + create_jump_keys="true" + label="Select Build Tool" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + + <menu_item_separator/> + + <menu_item_call + label="Zoom In" + name="Zoom In" + shortcut="control|0"> + <menu_item_call.on_click + function="View.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Zoom Default" + name="Zoom Default" + shortcut="control|9"> + <menu_item_call.on_click + function="View.ZoomDefault" /> + </menu_item_call> + <menu_item_call + label="Zoom Out" + name="Zoom Out" + shortcut="control|8"> + <menu_item_call.on_click + function="View.ZoomOut" /> + </menu_item_call> + <menu_item_separator + visible="false"/> + <!-- Made invisible to avoid a dissonance: menu item toggles the menu where it is located. EXT-8069. + Can't be removed, to keep shortcut workable. + --> + <menu_item_check + label="Show Advanced Menu" + name="Show Advanced Menu" + shortcut="control|alt|D" + visible="false"> + <on_check + function="CheckControl" + parameter="UseDebugMenus" /> + <on_click + function="ToggleControl" + parameter="UseDebugMenus" /> + </menu_item_check> + </menu> <!--Shortcuts--> + + <menu_item_separator/> + <menu_item_call - label="Clear Group Cache" - layout="topleft" - name="ClearGroupCache"> + label="Show Debug Settings" + name="Debug Settings"> <menu_item_call.on_click - function="Advanced.ClearGroupCache" - parameter="ClearGroupCache" /> + function="Advanced.ShowDebugSettings" + parameter="all" /> </menu_item_call> - <menu_item_check - label="Enable Lip Sync(Beta)" - layout="topleft" - name="Enable Lip Sync(Beta)"> - <menu_item_check.on_check - function="CheckControl" - parameter="LipSyncEnabled" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="LipSyncEnabled" /> - </menu_item_check> - <menu_item_check - label="Tap-Tap-Hold to Run" - layout="topleft" - name="Tap-Tap-Hold to Run"> - <menu_item_check.on_check - function="Advanced.CheckAllowTapTapHoldRun" - parameter="TapTapHoldRun" /> - <menu_item_check.on_click - function="Advanced.ToggleAllowTapTapHoldRun" /> - </menu_item_check> - <menu_item_check - label="Mouse Smoothing" - layout="topleft" - name="Mouse Smoothing"> + <menu_item_check + label="Show Develop Menu" + name="Debug Mode" + shortcut="control|alt|Q"> <menu_item_check.on_check function="CheckControl" - parameter="MouseSmooth" /> + parameter="QAMode" /> <menu_item_check.on_click function="ToggleControl" - parameter="MouseSmooth" /> + parameter="QAMode" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Debug Settings" - layout="topleft" - name="Debug Settings"> - <menu_item_call.on_click - function="Advanced.ShowDebugSettings" - parameter="all" /> - </menu_item_call> + </menu> <menu create_jump_keys="true" - label="Debug" - layout="topleft" - name="Debug" + label="Develop" + name="Develop" tear_off="true" visible="false"> <menu create_jump_keys="true" label="Consoles" - layout="topleft" name="Consoles" tear_off="true"> <menu_item_check label="Texture Console" - layout="topleft" name="Texture Console" - shortcut="control|shift|3"> + shortcut="control|shift|3" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="texture" /> @@ -1851,9 +1759,9 @@ </menu_item_check> <menu_item_check label="Debug Console" - layout="topleft" name="Debug Console" - shortcut="control|shift|4"> + shortcut="control|shift|4" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="debug" /> @@ -1861,11 +1769,41 @@ function="Advanced.ToggleConsole" parameter="debug" /> </menu_item_check> + <menu_item_call + label="Notifications Console" + name="Notifications" + shortcut="control|shift|5"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="notifications_console" /> + </menu_item_call> + <menu_item_check + label="Texture Size Console" + name="Texture Size" + shortcut="control|shift|6"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="texture size" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="texture size" /> + </menu_item_check> + <menu_item_check + label="Texture Category Console" + name="Texture Category" + shortcut="control|shift|7"> + <menu_item_check.on_check + function="Advanced.CheckConsole" + parameter="texture category" /> + <menu_item_check.on_click + function="Advanced.ToggleConsole" + parameter="texture category" /> + </menu_item_check> <menu_item_check label="Fast Timers" - layout="topleft" name="Fast Timers" - shortcut="control|shift|9"> + shortcut="control|shift|9" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="fast timers" /> @@ -1875,9 +1813,9 @@ </menu_item_check> <menu_item_check label="Memory" - layout="topleft" name="Memory" - shortcut="control|shift|0"> + shortcut="control|shift|0" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="memory view" /> @@ -1885,23 +1823,11 @@ function="Advanced.ToggleConsole" parameter="memory view" /> </menu_item_check> - <menu_item_check - label="Notifications Console" - layout="topleft" - name="Notifications" - shortcut="control|shift|5"> - <menu_item_check.on_check - function="Advanced.CheckConsole" - parameter="notifications" /> - <menu_item_check.on_click - function="Advanced.ToggleConsole" - parameter="notifications" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_call label="Region Info to Debug Console" - layout="topleft" name="Region Info to Debug Console"> <menu_item_call.on_click function="Advanced.DumpInfoToConsole" @@ -1909,7 +1835,6 @@ </menu_item_call> <menu_item_call label="Group Info to Debug Console" - layout="topleft" name="Group Info to Debug Console"> <menu_item_call.on_click function="Advanced.DumpInfoToConsole" @@ -1917,22 +1842,125 @@ </menu_item_call> <menu_item_call label="Capabilities Info to Debug Console" - layout="topleft" name="Capabilities Info to Debug Console"> <menu_item_call.on_click function="Advanced.DumpInfoToConsole" parameter="capabilities" /> </menu_item_call> + + <menu_item_separator/> + + <menu_item_check + label="Camera" + name="Camera"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="camera" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="camera" /> + </menu_item_check> + <menu_item_check + label="Wind" + name="Wind"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="wind" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="wind" /> + </menu_item_check> + <menu_item_check + label="FOV" + name="FOV"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="fov" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="fov" /> + </menu_item_check> + <menu_item_check + label="Badge" + name="Badge" + shortcut="alt|control|shift|h"> + <menu_item_check.on_check + function="Advanced.CheckHUDInfo" + parameter="badge" /> + <menu_item_check.on_click + function="Advanced.ToggleHUDInfo" + parameter="badge" /> + </menu_item_check> </menu> <menu create_jump_keys="true" - label="Debugging" - layout="topleft" + label="Show Info" + name="Display Info" + tear_off="true"> + <menu_item_check + label="Show Time" + name="Show Time"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowTime" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowTime" /> + </menu_item_check> + <menu_item_check + label="Show Render Info" + name="Show Render Info"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowRenderInfo" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowRenderInfo" /> + </menu_item_check> + <menu_item_check + label="Show Matrices" + name="Show Matrices"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowRenderMatrices" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowRenderMatrices" /> + </menu_item_check> + <menu_item_check + label="Show Color Under Cursor" + name="Show Color Under Cursor"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowColor" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowColor" /> + </menu_item_check> + + <menu_item_separator/> + + <menu_item_check + label="Show Updates to Objects" + name="Show Updates" + shortcut="control|alt|shift|U"> + <menu_item_check.on_check + function="Advanced.CheckShowObjectUpdates" + parameter="ObjectUpdates" /> + <menu_item_check.on_click + function="Advanced.ToggleShowObjectUpdates" /> + </menu_item_check> + </menu> + + <menu_item_separator/> + + <menu + create_jump_keys="true" + label="Force an Error" name="Force Errors" tear_off="true"> <menu_item_call label="Force Breakpoint" - layout="topleft" name="Force Breakpoint" shortcut="control|alt|shift|B"> <menu_item_call.on_click @@ -1940,79 +1968,55 @@ </menu_item_call> <menu_item_call label="Force LLError And Crash" - layout="topleft" name="Force LLError And Crash"> <menu_item_call.on_click function="Advanced.ForceErrorLlerror" /> </menu_item_call> <menu_item_call label="Force Bad Memory Access" - layout="topleft" name="Force Bad Memory Access"> <menu_item_call.on_click function="Advanced.ForceErrorBadMemoryAccess" /> </menu_item_call> <menu_item_call label="Force Infinite Loop" - layout="topleft" name="Force Infinite Loop"> <menu_item_call.on_click function="Advanced.ForceErrorInfiniteLoop" /> </menu_item_call> <menu_item_call label="Force Driver Crash" - layout="topleft" name="Force Driver Carsh"> <menu_item_call.on_click function="Advanced.ForceErrorDriverCrash" /> </menu_item_call> <menu_item_call label="Force Software Exception" - layout="topleft" name="Force Software Exception"> <menu_item_call.on_click function="Advanced.ForceErrorSoftwareException" /> </menu_item_call> <menu_item_call label="Force Disconnect Viewer" - layout="topleft" name="Force Disconnect Viewer"> <menu_item_call.on_click function="Advanced.ForceErrorDisconnectViewer" /> </menu_item_call> + <menu_item_call + label="Simulate a Memory Leak" + name="Memory Leaking Simulation"> + <menu_item_call.on_click + function="Floater.Show" + parameter="mem_leaking" /> + </menu_item_call> </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Output Debug Minidump" - layout="topleft" - name="Output Debug Minidump"> - <menu_item_check.on_check - function="CheckControl" - parameter="SaveMinidump" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="SaveMinidump" /> - </menu_item_check> - <menu_item_call - label="Memory Leaking Simulation" - layout="topleft" - name="Memory Leaking Simulation"> - <menu_item_call.on_click - function="Advanced.MemoryLeakingSimulation" - parameter="" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> <menu create_jump_keys="true" label="Render Tests" - layout="topleft" name="Render Tests" tear_off="true"> <menu_item_check label="Camera Offset" - layout="topleft" name="Camera Offset"> <menu_item_check.on_check function="CheckControl" @@ -2023,7 +2027,6 @@ </menu_item_check> <menu_item_check label="Randomize Framerate" - layout="topleft" name="Randomize Framerate"> <menu_item_check.on_check function="Advanced.CheckRandomizeFramerate" @@ -2033,7 +2036,6 @@ </menu_item_check> <menu_item_check label="Periodic Slow Frame" - layout="topleft" name="Periodic Slow Frame"> <menu_item_check.on_check function="Advanced.CheckPeriodicSlowFrame" @@ -2044,7 +2046,6 @@ </menu_item_check> <menu_item_check label="Frame Test" - layout="topleft" name="Frame Test"> <menu_item_check.on_check function="Advanced.CheckFrameTest" @@ -2053,422 +2054,139 @@ function="Advanced.ToggleFrameTest" /> </menu_item_check> </menu> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Display Info" - layout="topleft" - name="Display Info" - tear_off="true"> - <menu_item_check - label="Show Time" - layout="topleft" - name="Show Time"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowTime" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowTime" /> - </menu_item_check> - <menu_item_check - label="Show Render Info" - layout="topleft" - name="Show Render Info"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowRenderInfo" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowRenderInfo" /> - </menu_item_check> - <menu_item_check - label="Show Matrices" - layout="topleft" - name="Show Matrices"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowRenderMatrices" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowRenderMatrices" /> - </menu_item_check> - <menu_item_check - label="Show Color Under Cursor" - layout="topleft" - name="Show Color Under Cursor"> - <menu_item_check.on_check - function="CheckControl" - parameter="DebugShowColor" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="DebugShowColor" /> - </menu_item_check> - </menu> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Network" - layout="topleft" - name="Network" - tear_off="true"> - <menu_item_call - label="Enable Message Log" - layout="topleft" - name="Enable Message Log"> - <menu_item_call.on_click - function="Advanced.EnableMessageLog" /> - </menu_item_call> - <menu_item_call - label="Disable Message Log" - layout="topleft" - name="Disable Message Log"> - <menu_item_call.on_click - function="Advanced.DisableMessageLog" /> - </menu_item_call> - <menu_item_check - label="Velocity Interpolate Objects" - layout="topleft" - name="Velocity Interpolate Objects"> - <menu_item_check.on_check - function="CheckControl" - parameter="VelocityInterpolate" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="VelocityInterpolate" /> - </menu_item_check> - <menu_item_check - label="Ping Interpolate Object Positions" - layout="topleft" - name="Ping Interpolate Object Positions"> - <menu_item_check.on_check - function="CheckControl" - parameter="PingInterpolate" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="PingInterpolate" /> - </menu_item_check> - <menu_item_call - label="Drop a Packet" - layout="topleft" - name="Drop a Packet" - shortcut="control|alt|L"> - <menu_item_call.on_click - function="Advanced.DropPacket" /> - </menu_item_call> - <menu_item_check - label="Show Updates" - layout="topleft" - name="Show Updates" - shortcut="control|alt|shift|U"> - <menu_item_check.on_check - function="Advanced.CheckShowObjectUpdates" - parameter="ObjectUpdates" /> - <menu_item_check.on_click - function="Advanced.ToggleShowObjectUpdates" /> - </menu_item_check> - </menu> - <menu_item_separator - layout="topleft" /> + <menu + create_jump_keys="true" + label="Render Metadata" + name="Render Metadata" + tear_off="true"> <menu_item_check - label="View Admin Options" - layout="topleft" - name="View Admin Options" - shortcut="control|alt|V"> - <menu_item_check.on_check - function="Advanced.CheckViewAdminOptions" - parameter="ViewAdminOptions" /> - <menu_item_check.on_click - function="Advanced.ToggleViewAdminOptions" /> + label="Bounding Boxes" + name="Bounding Boxes"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="bboxes" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="bboxes" /> </menu_item_check> - <menu_item_call - label="Request Admin Status" - layout="topleft" - name="Request Admin Options" - shortcut="control|alt|G"> - <menu_item_call.on_click - function="Advanced.RequestAdminStatus" /> - </menu_item_call> - <menu_item_call - label="Leave Admin Status" - layout="topleft" - name="Leave Admin Options" - shortcut="control|alt|shift|G"> - <menu_item_call.on_click - function="Advanced.LeaveAdminStatus" /> - </menu_item_call> - </menu> - <menu - create_jump_keys="true" - label="Develop" - layout="topleft" - name="Develop" - tear_off="true" - visible="false"> - <menu - create_jump_keys="true" - label="HUD Info" - layout="topleft" - name="HUD Info" - tear_off="true"> - <menu_item_check - label="Camera" - layout="topleft" - name="Camera"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="camera" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="camera" /> - </menu_item_check> - <menu_item_check - label="Wind" - layout="topleft" - name="Wind"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="wind" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="wind" /> - </menu_item_check> - <menu_item_check - label="FOV" - layout="topleft" - name="FOV"> - <menu_item_check.on_check - function="Advanced.CheckHUDInfo" - parameter="fov" /> - <menu_item_check.on_click - function="Advanced.ToggleHUDInfo" - parameter="fov" /> - </menu_item_check> - </menu> + <menu_item_check + label="Octree" + name="Octree"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="octree" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="octree" /> + </menu_item_check> + <menu_item_check + label="Shadow Frusta" + name="Shadow Frusta"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="shadow frusta" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="shadow frusta" /> + </menu_item_check> + <menu_item_check + label="Occlusion" + name="Occlusion"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="occlusion" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="occlusion" /> + </menu_item_check> + <menu_item_check + label="Render Batches" + name="Render Batches"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="render batches" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="render batches" /> + </menu_item_check> + <menu_item_check + label="Texture Anim" + name="Texture Anim"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture anim" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture anim" /> + </menu_item_check> + <menu_item_check + label="Texture Priority" + name="Texture Priority"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture priority" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture priority" /> + </menu_item_check> + <menu_item_check + label="Texture Area" + name="Texture Area"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="texture area" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="texture area" /> + </menu_item_check> + <menu_item_check + label="Face Area" + name="Face Area"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="face area" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="face area" /> + </menu_item_check> + <menu_item_check + label="Lights" + name="Lights"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="lights" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="lights" /> + </menu_item_check> + <menu_item_check + label="Collision Skeleton" + name="Collision Skeleton"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="collision skeleton" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="collision skeleton" /> + </menu_item_check> + <menu_item_check + label="Raycast" + name="Raycast"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="raycast" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="raycast" /> + </menu_item_check> + </menu> <menu create_jump_keys="true" label="Rendering" - layout="topleft" name="Rendering" tear_off="true"> - <menu - create_jump_keys="true" - label="Info Displays" - layout="topleft" - name="Info Displays" - tear_off="true"> - <menu_item_check - label="Verify" - layout="topleft" - name="Verify"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="verify" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="verify" /> - </menu_item_check> - <menu_item_check - label="BBoxes" - layout="topleft" - name="BBoxes"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="bboxes" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="bboxes" /> - </menu_item_check> - <menu_item_check - label="Points" - layout="topleft" - name="Points"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="points" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="points" /> - </menu_item_check> - <menu_item_check - label="Octree" - layout="topleft" - name="Octree"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="octree" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="octree" /> - </menu_item_check> - <menu_item_check - label="Shadow Frusta" - layout="topleft" - name="Shadow Frusta"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="shadow frusta" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="shadow frusta" /> - </menu_item_check> - <menu_item_check - label="Occlusion" - layout="topleft" - name="Occlusion"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="occlusion" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="occlusion" /> - </menu_item_check> - <menu_item_check - label="Render Batches" - layout="topleft" - name="Render Batches"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="render batches" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="render batches" /> - </menu_item_check> - <menu_item_check - label="Animated Textures" - layout="topleft" - name="Animated Textures"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture anim" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture anim" /> - </menu_item_check> - <menu_item_check - label="Texture Priority" - layout="topleft" - name="Texture Priority"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture priority" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture priority" /> - </menu_item_check> - <menu_item_check - label="Avatar Rendering Cost" - layout="topleft" - name="Avatar Rendering Cost"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="shame" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="shame" /> - </menu_item_check> - <menu_item_check - label="Texture Area (sqrt(A))" - layout="topleft" - name="Texture Area (sqrt(A))"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="texture area" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="texture area" /> - </menu_item_check> - <menu_item_check - label="Face Area (sqrt(A))" - layout="topleft" - name="Face Area (sqrt(A))"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="face area" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="face area" /> - </menu_item_check> - <menu_item_check - label="Lights" - layout="topleft" - name="Lights"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="lights" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="lights" /> - </menu_item_check> - <menu_item_check - label="Particles" - layout="topleft" - name="Particles"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="particles" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="particles" /> - </menu_item_check> - <menu_item_check - label="Composition" - layout="topleft" - name="Composition"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="composition" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="composition" /> - </menu_item_check> - <menu_item_check - label="Glow" - layout="topleft" - name="Glow"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="glow" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="glow" /> - </menu_item_check> - <menu_item_check - label="Show Depth Buffer" - layout="topleft" - name="Show Depth Buffer"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="ShowDepthBuffer" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="ShowDepthBuffer" /> - </menu_item_check> - <menu_item_check - label="Pick Render" - layout="topleft" - name="Pick Render"> - <menu_item_check.on_check - function="Advanced.CheckInfoDisplay" - parameter="picking" /> - <menu_item_check.on_click - function="Advanced.ToggleInfoDisplay" - parameter="picking" /> - </menu_item_check> - <menu_item_call - label="Vectorize Perf Test" - layout="topleft" - name="Vectorize Perf Test"> - <menu_item_call.on_click - function="Advanced.VectorizePerfTest" - parameter="" /> - </menu_item_call> - </menu> <menu_item_check label="Axes" - layout="topleft" name="Axes"> <menu_item_check.on_check function="CheckControl" @@ -2479,7 +2197,6 @@ </menu_item_check> <menu_item_check label="Tangent Basis" - layout="topleft" name="Tangent Basis"> <menu_item_check.on_check function="CheckControl" @@ -2490,7 +2207,6 @@ </menu_item_check> <menu_item_call label="Selected Texture Info Basis" - layout="topleft" name="Selected Texture Info Basis" shortcut="control|alt|shift|T"> <menu_item_call.on_click @@ -2498,7 +2214,6 @@ </menu_item_call> <menu_item_check label="Wireframe" - layout="topleft" name="Wireframe" shortcut="control|shift|R"> <menu_item_check.on_check @@ -2509,7 +2224,6 @@ </menu_item_check> <menu_item_check label="Object-Object Occlusion" - layout="topleft" name="Object-Object Occlusion" shortcut="control|shift|O"> <menu_item_check.on_check @@ -2521,9 +2235,74 @@ <menu_item_check.on_enable function="Advanced.EnableObjectObjectOcclusion" /> </menu_item_check> - <menu_item_check + <menu_item_check + label="Framebuffer Objects" + name="Framebuffer Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderUseFBO" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderUseFBO" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderFBO" /> + </menu_item_check> + + <menu_item_separator /> + + <menu_item_check + label="Lighting and Shadows" + name="Lighting and Shadows"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDeferred" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDeferred" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderDeferred" /> + </menu_item_check> + <menu_item_check + label=" Shadows from Sun/Moon/Projectors" + name="Shadows from Sun/Moon/Projectors"> + <menu_item_check.on_check + function="Advanced.CheckRenderShadowOption" + parameter="RenderShadowDetail" /> + <menu_item_check.on_click + function="Advanced.ClickRenderShadowOption" + parameter="RenderShadowDetail" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderDeferredOptions" /> + </menu_item_check> + <menu_item_check + label=" SSAO and Shadow Smoothing" + name="SSAO and Shadow Smoothing"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDeferredSSAO" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDeferredSSAO" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderDeferredOptions" /> + </menu_item_check> + <menu_item_check + label=" Global Illumination (experimental)" + name="Global Illumination"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderDeferredGI" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderDeferredGI" /> + <menu_item_check.on_enable + function="Advanced.EnableRenderDeferredOptions" /> + </menu_item_check> + + <menu_item_separator /> + + <menu_item_check label="Debug GL" - layout="topleft" name="Debug GL"> <menu_item_check.on_check function="CheckControl" @@ -2534,79 +2313,245 @@ </menu_item_check> <menu_item_check label="Debug Pipeline" - layout="topleft" name="Debug Pipeline"> <menu_item_check.on_check function="CheckControl" - parameter="RenderDebugGL" /> + parameter="RenderDebugPipeline" /> <menu_item_check.on_click function="ToggleControl" - parameter="RenderDebugGL" /> + parameter="RenderDebugPipeline" /> </menu_item_check> <menu_item_check - label="Fast Alpha" - layout="topleft" - name="Fast Alpha"> + label="Automatic Alpha Masks (deferred)" + name="Automatic Alpha Masks (deferred)"> <menu_item_check.on_check function="CheckControl" - parameter="RenderDebugGL" /> + parameter="RenderAutoMaskAlphaDeferred" /> <menu_item_check.on_click function="ToggleControl" - parameter="RenderDebugGL" /> + parameter="RenderAutoMaskAlphaDeferred" /> + </menu_item_check> + <menu_item_check + label="Automatic Alpha Masks (non-deferred)" + name="Automatic Alpha Masks (non-deferred)"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderAutoMaskAlphaNonDeferred" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderAutoMaskAlphaNonDeferred" /> </menu_item_check> <menu_item_check label="Animation Textures" - layout="topleft" name="Animation Textures"> <menu_item_check.on_check function="CheckControl" - parameter="RenderDebugGL" /> + parameter="AnimateTextures" /> <menu_item_check.on_click function="ToggleControl" - parameter="RenderDebugGL" /> + parameter="AnimateTextures" /> </menu_item_check> <menu_item_check label="Disable Textures" - layout="topleft" name="Disable Textures"> <menu_item_check.on_check - function="Advanced.CheckDisableTextures" - parameter="DisableTextures" /> + function="CheckControl" + parameter="TextureDisable" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="TextureDisable" /> + </menu_item_check> + <menu_item_check + label="Full Res Textures" + name="Rull Res Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="TextureLoadFullRes" /> <menu_item_check.on_click - function="Advanced.ToggleDisableTextures" /> + function="ToggleControl" + parameter="TextureLoadFullRes" /> + </menu_item_check> + <menu_item_check + label="Audit Textures" + name="Audit Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="AuditTexture" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AuditTexture" /> </menu_item_check> <menu_item_check + label="Texture Atlas (experimental)" + name="Texture Atlas"> + <menu_item_check.on_check + function="CheckControl" + parameter="EnableTextureAtlas" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="EnableTextureAtlas" /> + </menu_item_check> + <menu_item_check label="Render Attached Lights" - layout="topleft" name="Render Attached Lights"> <menu_item_check.on_check function="CheckControl" parameter="RenderAttachedLights" /> <menu_item_check.on_click - function="Advanced.HandleAttchedLightParticles" + function="Advanced.HandleAttachedLightParticles" parameter="RenderAttachedLights" /> </menu_item_check> <menu_item_check label="Render Attached Particles" - layout="topleft" name="Render Attached Particles"> <menu_item_check.on_check function="CheckControl" parameter="RenderAttachedParticles" /> <menu_item_check.on_click - function="Advanced.HandleAttchedLightParticles" + function="Advanced.HandleAttachedLightParticles" parameter="RenderAttachedParticles" /> </menu_item_check> + <menu_item_check + label="Hover Glow Objects" + name="Hover Glow Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="RenderHoverGlowEnable" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="RenderHoverGlowEnable" /> + </menu_item_check> + </menu> + + <menu + create_jump_keys="true" + label="Network" + name="Network" + tear_off="true"> + <menu_item_check + label="Pause Agent" + name="AgentPause"> + <menu_item_check.on_check + function="CheckControl" + parameter="AgentPause" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="AgentPause" /> + </menu_item_check> + + <menu_item_separator/> + + <menu_item_call + label="Enable Message Log" + name="Enable Message Log"> + <menu_item_call.on_click + function="Advanced.EnableMessageLog" /> + </menu_item_call> + <menu_item_call + label="Disable Message Log" + name="Disable Message Log"> + <menu_item_call.on_click + function="Advanced.DisableMessageLog" /> + </menu_item_call> + + <menu_item_separator/> + + <menu_item_check + label="Velocity Interpolate Objects" + name="Velocity Interpolate Objects"> + <menu_item_check.on_check + function="CheckControl" + parameter="VelocityInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="VelocityInterpolate" /> + </menu_item_check> + <menu_item_check + label="Ping Interpolate Object Positions" + name="Ping Interpolate Object Positions"> + <menu_item_check.on_check + function="CheckControl" + parameter="PingInterpolate" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="PingInterpolate" /> + </menu_item_check> + + <menu_item_separator/> + + <menu_item_call + label="Drop a Packet" + name="Drop a Packet" + shortcut="control|alt|L"> + <menu_item_call.on_click + function="Advanced.DropPacket" /> + </menu_item_call> + </menu> + <menu_item_call + label="Dump Scripted Camera" + name="Dump Scripted Camera"> + <menu_item_call.on_click + function="Advanced.DumpScriptedCamera" /> + </menu_item_call> + <menu_item_call + label="Bumps, Pushes & Hits" + name="Bumps, Pushes &amp; Hits"> + <menu_item_call.on_click + function="Floater.Show" + parameter="bumps" /> + </menu_item_call> + + <menu + create_jump_keys="true" + label="Recorder" + name="Recorder" + tear_off="true"> + <menu_item_call + label="Start Playback" + name="Start Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start playback" /> + </menu_item_call> + <menu_item_call + label="Stop Playback" + name="Stop Playback"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop playback" /> + </menu_item_call> + <menu_item_check + label="Loop Playback" + name="Loop Playback"> + <menu_item_check.on_check + function="Advanced.CheckAgentPilotLoop" + parameter="loopPlayback" /> + <menu_item_check.on_click + function="Advanced.ToggleAgentPilotLoop" /> + </menu_item_check> + <menu_item_call + label="Start Record" + name="Start Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="start record" /> + </menu_item_call> + <menu_item_call + label="Stop Record" + name="Stop Record"> + <menu_item_call.on_click + function="Advanced.AgentPilot" + parameter="stop record" /> + </menu_item_call> </menu> + <menu create_jump_keys="true" label="World" - layout="topleft" name="World" tear_off="true"> <menu_item_check label="Sim Sun Override" - layout="topleft" name="Sim Sun Override"> <menu_item_check.on_check function="CheckControl" @@ -2617,7 +2562,6 @@ </menu_item_check> <menu_item_check label="Cheesy Beacon" - layout="topleft" name="Cheesy Beacon"> <menu_item_check.on_check function="CheckControl" @@ -2628,7 +2572,6 @@ </menu_item_check> <menu_item_check label="Fixed Weather" - layout="topleft" name="Fixed Weather"> <menu_item_check.on_check function="CheckControl" @@ -2639,7 +2582,6 @@ </menu_item_check> <menu_item_call label="Dump Region Object Cache" - layout="topleft" name="Dump Region Object Cache"> <menu_item_call.on_click function="Advanced.DumpRegionObjectCache" /> @@ -2648,12 +2590,10 @@ <menu create_jump_keys="true" label="UI" - layout="topleft" name="UI" tear_off="true"> - <menu_item_check + <!-- <menu_item_check label="New Bottom Bar" - layout="topleft" name="New Bottom Bar"> <menu_item_check.on_check function="CheckControl" @@ -2661,63 +2601,40 @@ <menu_item_check.on_click function="ToggleControl" parameter="BottomPanelNew" /> - </menu_item_check> + </menu_item_check>--> <menu_item_call label="Web Browser Test" - layout="topleft" name="Web Browser Test"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" /> + function="Advanced.WebBrowserTest" + parameter="http://secondlife.com/app/search/slurls.html"/> </menu_item_call> <menu_item_call - label="Buy Currency Test" - layout="topleft" - name="Buy Currency Test"> - <menu_item_call.on_click - function="Advanced.BuyCurrencyTest" /> - </menu_item_call> - <menu_item_call - label="UI/Color Settings" - layout="topleft" - name="UI/Color Settings"> - <menu_item_call.on_click - function="Advanced.ShowDebugSettings" - parameter="skin" /> - </menu_item_call> - <menu_item_check - label="Editable UI" - layout="topleft" - name="Editable UI"> - <menu_item_check.on_check - function="Advanced.CheckEditableUI" /> - <menu_item_check.on_click - function="Advanced.ToggleEditableUI" /> - </menu_item_check> - <menu_item_call label="Dump SelectMgr" - layout="topleft" name="Dump SelectMgr"> <menu_item_call.on_click function="Advanced.DumpSelectMgr" /> </menu_item_call> <menu_item_call label="Dump Inventory" - layout="topleft" name="Dump Inventory"> <menu_item_call.on_click function="Advanced.DumpInventory" /> </menu_item_call> <menu_item_call + label="Dump Timers" + name="Dump Timers"> + <menu_item_call.on_click + function="Advanced.DumpTimers" /> + </menu_item_call> + <menu_item_call label="Dump Focus Holder" - layout="topleft" - name="Dump Focus Holder" - shortcut="control|alt|F"> + name="Dump Focus Holder"> <menu_item_call.on_click function="Advanced.DumpFocusHolder" /> </menu_item_call> <menu_item_call label="Print Selected Object Info" - layout="topleft" name="Print Selected Object Info" shortcut="control|shift|P"> <menu_item_call.on_click @@ -2725,7 +2642,6 @@ </menu_item_call> <menu_item_call label="Print Agent Info" - layout="topleft" name="Print Agent Info" shortcut="shift|P"> <menu_item_call.on_click @@ -2733,7 +2649,6 @@ </menu_item_call> <menu_item_call label="Memory Stats" - layout="topleft" name="Memory Stats" shortcut="control|alt|shift|M"> <menu_item_call.on_click @@ -2741,7 +2656,6 @@ </menu_item_call> <menu_item_check label="Double-ClickAuto-Pilot" - layout="topleft" name="Double-ClickAuto-Pilot"> <menu_item_check.on_check function="CheckControl" @@ -2750,11 +2664,21 @@ function="ToggleControl" parameter="DoubleClickAutoPilot" /> </menu_item_check> - <menu_item_separator - layout="topleft" /> + <menu_item_check + label="Double-Click Teleport" + name="DoubleClick Teleport"> + <menu_item_check.on_check + function="CheckControl" + parameter="DoubleClickTeleport" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DoubleClickTeleport" /> + </menu_item_check> + + <menu_item_separator /> + <menu_item_check label="Debug SelectMgr" - layout="topleft" name="Debug SelectMgr"> <menu_item_check.on_check function="CheckControl" @@ -2765,7 +2689,6 @@ </menu_item_check> <menu_item_check label="Debug Clicks" - layout="topleft" name="Debug Clicks"> <menu_item_check.on_check function="Advanced.CheckDebugClicks" @@ -2776,7 +2699,6 @@ </menu_item_check> <menu_item_check label="Debug Views" - layout="topleft" name="Debug Views"> <menu_item_check.on_check function="Advanced.CheckDebugViews" /> @@ -2785,7 +2707,6 @@ </menu_item_check> <menu_item_check label="Debug Name Tooltips" - layout="topleft" name="Debug Name Tooltips"> <menu_item_check.on_check function="Advanced.CheckXUINameTooltips" @@ -2795,7 +2716,6 @@ </menu_item_check> <menu_item_check label="Debug Mouse Events" - layout="topleft" name="Debug Mouse Events"> <menu_item_check.on_check function="Advanced.CheckDebugMouseEvents" @@ -2805,7 +2725,6 @@ </menu_item_check> <menu_item_check label="Debug Keys" - layout="topleft" name="Debug Keys"> <menu_item_check.on_check function="Advanced.CheckDebugKeys" @@ -2815,7 +2734,6 @@ </menu_item_check> <menu_item_check label="Debug WindowProc" - layout="topleft" name="Debug WindowProc"> <menu_item_check.on_check function="Advanced.CheckDebugWindowProc" @@ -2828,33 +2746,35 @@ <menu create_jump_keys="true" label="XUI" - layout="topleft" name="XUI" tear_off="true"> <menu_item_call + label="Reload Color Settings" + name="Reload Color Settings"> + <menu_item_call.on_click + function="Advanced.ReloadColorSettings" /> + </menu_item_call> + <menu_item_call label="Show Font Test" - layout="topleft" name="Show Font Test"> <menu_item_call.on_click - function="Advanced.ShowFontTest" /> + function="Floater.Show" + parameter="font_test" /> </menu_item_call> <menu_item_call - label="Load from XML..." - layout="topleft" + label="Load from XML" name="Load from XML"> <menu_item_call.on_click function="Advanced.LoadUIFromXML" /> </menu_item_call> <menu_item_call - label="Save to XML..." - layout="topleft" + label="Save to XML" name="Save to XML"> <menu_item_call.on_click function="Advanced.SaveUIToXML" /> </menu_item_call> <menu_item_check label="Show XUI Names" - layout="topleft" name="Show XUI Names"> <menu_item_check.on_check function="Advanced.CheckXUINames" @@ -2862,126 +2782,113 @@ <menu_item_check.on_click function="Advanced.ToggleXUINames" /> </menu_item_check> + <menu_item_call + label="Send Test IMs" + name="Send Test IMs"> + <menu_item_call.on_click + function="Advanced.SendTestIMs" /> + </menu_item_call> </menu> <menu create_jump_keys="true" - label="Character" - layout="topleft" + label="Avatar" name="Character" tear_off="true"> <menu create_jump_keys="true" label="Grab Baked Texture" - layout="topleft" name="Grab Baked Texture" tear_off="true"> <menu_item_call label="Iris" - layout="topleft" name="Iris"> <menu_item_call.on_click function="Advanced.GrabBakedTexture" parameter="iris" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="iris" /> </menu_item_call> <menu_item_call label="Head" - layout="topleft" name="Head"> <menu_item_call.on_click function="Advanced.GrabBakedTexture" parameter="head" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="head" /> </menu_item_call> <menu_item_call label="Upper Body" - layout="topleft" name="Upper Body"> <menu_item_call.on_click function="Advanced.GrabBakedTexture" parameter="upper" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="upper" /> </menu_item_call> <menu_item_call label="Lower Body" - layout="topleft" name="Lower Body"> <menu_item_call.on_click function="Advanced.GrabBakedTexture" parameter="lower" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="lower" /> </menu_item_call> <menu_item_call label="Skirt" - layout="topleft" name="Skirt"> <menu_item_call.on_click function="Advanced.GrabBakedTexture" parameter="skirt" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> - </menu_item_call> - <menu_item_call - label="Skirt" - layout="topleft" - name="Hair"> - <menu_item_call.on_click - function="Advanced.GrabBakedTexture" - parameter="hair" /> - <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="skirt" /> </menu_item_call> </menu> <menu create_jump_keys="true" label="Character Tests" - layout="topleft" name="Character Tests" tear_off="true"> <menu_item_call label="Appearance To XML" - layout="topleft" name="Appearance To XML"> <menu_item_call.on_click function="Advanced.AppearanceToXML" /> </menu_item_call> <menu_item_call label="Toggle Character Geometry" - layout="topleft" name="Toggle Character Geometry"> <menu_item_call.on_click function="Advanced.ToggleCharacterGeometry" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Test Male" - layout="topleft" name="Test Male"> <menu_item_call.on_click function="Advanced.TestMale" /> </menu_item_call> <menu_item_call label="Test Female" - layout="topleft" name="Test Female"> <menu_item_call.on_click function="Advanced.TestFemale" /> </menu_item_call> <menu_item_call label="Toggle PG" - layout="topleft" name="Toggle PG"> <menu_item_call.on_click function="Advanced.TogglePG" /> </menu_item_call> <menu_item_check label="Allow Select Avatar" - layout="topleft" name="Allow Select Avatar"> <menu_item_check.on_check function="CheckControl" @@ -2993,14 +2900,12 @@ </menu> <menu_item_call label="Force Params to Default" - layout="topleft" name="Force Params to Default"> <menu_item_call.on_click function="Advanced.ForceParamsToDefault" /> </menu_item_call> <menu_item_check label="Animation Info" - layout="topleft" name="Animation Info"> <menu_item_check.on_check function="Advanced.CheckAnimationInfo" @@ -3011,7 +2916,6 @@ </menu_item_check> <menu_item_check label="Slow Motion Animations" - layout="topleft" name="Slow Motion Animations"> <menu_item_check.on_check function="CheckControl" @@ -3022,7 +2926,6 @@ </menu_item_check> <menu_item_check label="Show Look At" - layout="topleft" name="Show Look At"> <menu_item_check.on_check function="Advanced.CheckShowLookAt" @@ -3032,7 +2935,6 @@ </menu_item_check> <menu_item_check label="Show Point At" - layout="topleft" name="Show Point At"> <menu_item_check.on_check function="Advanced.CheckShowPointAt" @@ -3042,7 +2944,6 @@ </menu_item_check> <menu_item_check label="Debug Joint Updates" - layout="topleft" name="Debug Joint Updates"> <menu_item_check.on_check function="Advanced.CheckDebugJointUpdates" @@ -3052,7 +2953,6 @@ </menu_item_check> <menu_item_check label="Disable LOD" - layout="topleft" name="Disable LOD"> <menu_item_check.on_check function="Advanced.CheckDisableLOD" @@ -3062,7 +2962,6 @@ </menu_item_check> <menu_item_check label="Debug Character Vis" - layout="topleft" name="Debug Character Vis"> <menu_item_check.on_check function="Advanced.CheckDebugCharacterVis" @@ -3072,7 +2971,6 @@ </menu_item_check> <menu_item_check label="Show Collision Skeleton" - layout="topleft" name="Show Collision Skeleton"> <menu_item_check.on_check function="Advanced.CheckInfoDisplay" @@ -3083,7 +2981,6 @@ </menu_item_check> <menu_item_check label="Display Agent Target" - layout="topleft" name="Display Agent Target"> <menu_item_check.on_check function="Advanced.CheckInfoDisplay" @@ -3092,9 +2989,9 @@ function="Advanced.ToggleInfoDisplay" parameter="agent target" /> </menu_item_check> - <!-- <menu_item_check +<!-- Appears not to exist anymore + <menu_item_check label="Debug Rotation" - layout="topleft" name="Debug Rotation"> <menu_item_check.on_check function="CheckControl" @@ -3103,16 +3000,15 @@ function="ToggleControl" parameter="DebugAvatarRotation" /> </menu_item_check> --> +--> <menu_item_call label="Dump Attachments" - layout="topleft" name="Dump Attachments"> <menu_item_call.on_click function="Advanced.DumpAttachments" /> </menu_item_call> <menu_item_call label="Debug Avatar Textures" - layout="topleft" name="Debug Avatar Textures" shortcut="control|alt|shift|A"> <menu_item_call.on_click @@ -3120,36 +3016,43 @@ </menu_item_call> <menu_item_call label="Dump Local Textures" - layout="topleft" name="Dump Local Textures" shortcut="alt|shift|M"> <menu_item_call.on_click function="Advanced.DumpAvatarLocalTextures" /> </menu_item_call> </menu> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_check - label="Debug Permissions" - layout="topleft" - name="DebugPermissions"> + label="HTTP Textures" + name="HTTP Textures"> <menu_item_check.on_check function="CheckControl" - parameter="DebugPermissions" /> + parameter="ImagePipelineUseHTTP" /> <menu_item_check.on_click function="ToggleControl" - parameter="DebugPermissions" /> + parameter="ImagePipelineUseHTTP" /> </menu_item_check> <menu_item_call label="Compress Images" - layout="topleft" name="Compress Images"> <menu_item_call.on_click function="Advanced.CompressImage" /> </menu_item_call> <menu_item_check - label="Console Window" - layout="topleft" + label="Output Debug Minidump" + name="Output Debug Minidump"> + <menu_item_check.on_check + function="CheckControl" + parameter="SaveMinidump" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="SaveMinidump" /> + </menu_item_check> + <menu_item_check + label="Console Window on next Run" name="Console Window"> <menu_item_check.on_check function="CheckControl" @@ -3158,179 +3061,185 @@ function="ToggleControl" parameter="ShowConsoleWindow" /> </menu_item_check> + + <menu_item_separator/> + + <menu_item_check + label="Show Admin Menu" + name="View Admin Options"> + <menu_item_check.on_check + function="Advanced.CheckViewAdminOptions" + parameter="ViewAdminOptions" /> + <menu_item_check.on_click + function="Advanced.ToggleViewAdminOptions" /> + </menu_item_check> + <menu_item_call + label="Request Admin Status" + name="Request Admin Options" + shortcut="control|alt|G"> + <menu_item_call.on_click + function="Advanced.RequestAdminStatus" /> + </menu_item_call> + <menu_item_call + label="Leave Admin Status" + name="Leave Admin Options" + shortcut="control|alt|shift|G"> + <menu_item_call.on_click + function="Advanced.LeaveAdminStatus" /> + </menu_item_call> </menu> <menu create_jump_keys="true" label="Admin" - layout="topleft" name="Admin" tear_off="true" visible="false"> <menu create_jump_keys="true" label="Object" - layout="topleft" tear_off="true"> <menu_item_call label="Take Copy" - layout="topleft" name="Take Copy" shortcut="control|alt|shift|O"> <menu_item_call.on_click function="Admin.ForceTakeCopy" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Force Owner To Me" - layout="topleft" name="Force Owner To Me"> <menu_item_call.on_click function="Admin.HandleObjectOwnerSelf" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Force Owner Permissive" - layout="topleft" name="Force Owner Permissive"> <menu_item_call.on_click function="Admin.HandleObjectOwnerPermissive" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Delete" - layout="topleft" name="Delete" shortcut="control|alt|shift|Del"> <menu_item_call.on_click function="Admin.HandleForceDelete" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Lock" - layout="topleft" name="Lock" shortcut="control|alt|shift|L"> <menu_item_call.on_click function="Admin.HandleObjectLock" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Get Assets IDs" - layout="topleft" name="Get Assets IDs" shortcut="control|alt|shift|I"> <menu_item_call.on_click function="Admin.HandleObjectAssetIDs" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu create_jump_keys="true" label="Parcel" - layout="topleft" name="Parcel" tear_off="true"> <menu_item_call - label="Owner To Me" - layout="topleft" + label="Force Owner To Me" name="Owner To Me"> <menu_item_call.on_click function="Admin.HandleForceParcelOwnerToMe" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Set to Linden Content" - layout="topleft" name="Set to Linden Content" shortcut="control|alt|shift|C"> <menu_item_call.on_click function="Admin.HandleForceParcelToContent" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Claim Public Land" - layout="topleft" name="Claim Public Land"> <menu_item_call.on_click function="Admin.HandleClaimPublicLand" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu create_jump_keys="true" label="Region" - layout="topleft" name="Region" tear_off="true"> <menu_item_call label="Dump Temp Asset Data" - layout="topleft" name="Dump Temp Asset Data"> <menu_item_call.on_click function="Admin.HandleRegionDumpTempAssetData" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Save Region State" - layout="topleft" name="Save Region State"> <menu_item_call.on_click function="Admin.OnSaveState" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu_item_call label="God Tools" - layout="topleft" name="God Tools"> <menu_item_call.on_click - function="Admin.ShowGodTools" /> + function="Floater.Show" + parameter="god_tools" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu create_jump_keys="true" label="Admin" - layout="topleft" name="Deprecated" tear_off="true" visible="false"> <menu create_jump_keys="true" label="Attach Object" - layout="topleft" mouse_opaque="false" name="Attach Object" tear_off="true" /> <menu create_jump_keys="true" label="Detach Object" - layout="topleft" mouse_opaque="false" name="Detach Object" tear_off="true" /> <menu create_jump_keys="true" label="Take Off Clothing" - layout="topleft" mouse_opaque="false" name="Take Off Clothing" tear_off="true"> <menu_item_call label="Shirt" - layout="topleft" name="Shirt"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3341,7 +3250,6 @@ </menu_item_call> <menu_item_call label="Pants" - layout="topleft" name="Pants"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3352,7 +3260,6 @@ </menu_item_call> <menu_item_call label="Shoes" - layout="topleft" name="Shoes"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3363,7 +3270,6 @@ </menu_item_call> <menu_item_call label="Socks" - layout="topleft" name="Socks"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3374,7 +3280,6 @@ </menu_item_call> <menu_item_call label="Jacket" - layout="topleft" name="Jacket"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3385,7 +3290,6 @@ </menu_item_call> <menu_item_call label="Gloves" - layout="topleft" name="Gloves"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3396,7 +3300,6 @@ </menu_item_call> <menu_item_call label="Undershirt" - layout="topleft" name="Menu Undershirt"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3407,7 +3310,6 @@ </menu_item_call> <menu_item_call label="Underpants" - layout="topleft" name="Menu Underpants"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3418,7 +3320,6 @@ </menu_item_call> <menu_item_call label="Skirt" - layout="topleft" name="Skirt"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3429,7 +3330,6 @@ </menu_item_call> <menu_item_call label="Alpha" - layout="topleft" name="Alpha"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3440,7 +3340,6 @@ </menu_item_call> <menu_item_call label="Tattoo" - layout="topleft" name="Tattoo"> <menu_item_call.on_click function="Edit.TakeOff" @@ -3451,92 +3350,79 @@ </menu_item_call> <menu_item_call label="All Clothes" - layout="topleft" name="All Clothes"> <menu_item_call.on_click function="Edit.TakeOff" parameter="all" /> </menu_item_call> </menu> - <menu_item_check - label="Show Toolbar" - layout="topleft" - name="Show Toolbar"> - <menu_item_check.on_check - function="FloaterVisible" - parameter="toolbar" /> - <menu_item_check.on_click - function="ShowFloater" - parameter="toolbar" /> - </menu_item_check> <menu create_jump_keys="true" label="Help" - layout="topleft" name="Help" tear_off="true"> <menu_item_call label="Official Linden Blog" - layout="topleft" name="Official Linden Blog"> <menu_item_call.on_click function="PromptShowURL" + name="OfficialLindenBlog_url" parameter="WebLaunchSupportWiki,http://blog.secondlife.com/" /> </menu_item_call> <menu_item_call label="Scripting Portal" - layout="topleft" name="Scripting Portal"> <menu_item_call.on_click function="PromptShowURL" + name="ScriptingPortal_url" parameter="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" /> </menu_item_call> <menu create_jump_keys="true" label="Bug Reporting" - layout="topleft" name="Bug Reporting" tear_off="true"> <menu_item_call label="Public Issue Tracker" - layout="topleft" name="Public Issue Tracker"> <menu_item_call.on_click function="PromptShowURL" + name="PublicIssueTracker_url" parameter="WebLaunchPublicIssue,http://jira.secondlife.com" /> </menu_item_call> <menu_item_call label="Public Issue Tracker Help" - layout="topleft" name="Publc Issue Tracker Help"> <menu_item_call.on_click function="PromptShowURL" + name="PublicIssueTrackerHelp_url" parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + + <menu_item_separator/> + <menu_item_call label="Bug Reporting 101" - layout="topleft" name="Bug Reporing 101"> <menu_item_call.on_click function="PromptShowURL" + name="BugReporting101_url" parameter="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" /> </menu_item_call> <menu_item_call label="Security Issues" - layout="topleft" name="Security Issues"> <menu_item_call.on_click function="PromptShowURL" + name="SecurityIssues_url" parameter="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" /> </menu_item_call> <menu_item_call label="QA Wiki" - layout="topleft" name="QA Wiki"> <menu_item_call.on_click function="PromptShowURL" + name="QAWiki_url" parameter="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" /> </menu_item_call> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml new file mode 100644 index 0000000000..aa56b4ba63 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + name="Outfit Wearable Context Menu"> + <menu_item_call + label="Replace" + layout="topleft" + name="wear_replace"> + <on_click + function="Wearable.Wear" /> + </menu_item_call> + <menu_item_call + label="Wear" + layout="topleft" + name="wear_wear"> + <on_click + function="Wearable.Wear" /> + </menu_item_call> + <menu_item_call + label="Add" + layout="topleft" + name="wear_add"> + <on_click + function="Wearable.Add" /> + </menu_item_call> + <menu_item_call + label="Take Off / Detach" + layout="topleft" + name="take_off_or_detach"> + <on_click + function="Wearable.TakeOffDetach" /> + </menu_item_call> + <menu_item_call + label="Detach" + layout="topleft" + name="detach"> + <on_click + function="Attachment.Detach" /> + </menu_item_call> + <context_menu + label="Attach to" + layout="topleft" + name="wearable_attach_to" /> + <context_menu + label="Attach to HUD" + layout="topleft" + name="wearable_attach_to_hud" /> + <menu_item_call + label="Take Off" + layout="topleft" + name="take_off"> + <on_click + function="Clothing.TakeOff" /> + </menu_item_call> + <menu_item_call + label="Edit" + layout="topleft" + name="edit"> + <on_click + function="Wearable.Edit" /> + </menu_item_call> + <menu_item_call + label="Item Profile" + layout="topleft" + name="object_profile"> + <on_click + function="Attachment.Profile" /> + </menu_item_call> + <menu_item_call + label="Show Original" + layout="topleft" + name="show_original"> + <on_click + function="Wearable.ShowOriginal" /> + </menu_item_call> + <menu_item_call + label="Create New" + layout="topleft" + name="create_new" + translate="false"> + <on_click + function="Wearable.CreateNew" /> + </menu_item_call> + <menu_item_call + label="--no options--" + layout="topleft" + name="--no options--" + translate="false"> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml new file mode 100644 index 0000000000..84ab16c709 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + layout="topleft" + visible="false" + name="Gear Wearing"> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Gear.Edit" /> + </menu_item_call> + <menu_item_call + label="Take Off" + layout="topleft" + name="takeoff"> + <on_click + function="Gear.TakeOff" /> + <on_enable + function="Gear.OnEnable" + parameter="take_off" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml new file mode 100644 index 0000000000..2d54e69601 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Wearing"> + <menu_item_call + label="Take Off" + layout="topleft" + name="take_off"> + <on_click + function="Wearing.TakeOff" /> + </menu_item_call> + <menu_item_call + label="Detach" + layout="topleft" + name="detach"> + <on_click + function="Wearing.Detach" + parameter="detach"/> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="edit_outfit_separator" /> + <menu_item_call + label="Edit Outfit" + layout="topleft" + name="edit"> + <on_click + function="Wearing.Edit" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index e3d102148a..a585069faa 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -7,7 +7,7 @@ none </defaultwidget> <defaultimpl> - LLMediaImplLLMozLib + media_plugin_webkit </defaultimpl> <widgetset name="web"> <label name="web_label"> @@ -55,27 +55,6 @@ true </allow_looping> </widgetset> - <widgetset name="none"> - <label name="none_label"> - No Content - </label> - <default_type> - none/none - </default_type> - <icon> - icn_media_web.tga - </icon> - <tooltip name="none_tooltip"> - No media here - </tooltip> - <playtip name="none_playtip" /> - <allow_resize> - false - </allow_resize> - <allow_looping> - false - </allow_looping> - </widgetset> <widgetset name="image"> <label name="image_label"> Image @@ -129,6 +108,9 @@ <widgettype> movie </widgettype> + <impl> + media_plugin_quicktime + </impl> </scheme> <mimetype name="blank"> <label name="blank_label"> @@ -138,7 +120,7 @@ none </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_webkit </impl> </mimetype> <mimetype name="none/none"> @@ -148,6 +130,9 @@ <widgettype> none </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="audio/*"> <label name="audio2_label"> @@ -156,6 +141,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="video/*"> <label name="video2_label"> @@ -164,6 +152,9 @@ <widgettype> movie </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="image/*"> <label name="image2_label"> @@ -172,6 +163,9 @@ <widgettype> image </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> <label name="vnd.secondlife.qt.legacy_label"> @@ -181,7 +175,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype name="application/javascript"> @@ -191,6 +185,9 @@ <widgettype> web </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/ogg"> <label name="application/ogg_label"> @@ -199,6 +196,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="application/pdf"> <label name="application/pdf_label"> @@ -207,6 +207,9 @@ <widgettype> image </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/postscript"> <label name="application/postscript_label"> @@ -215,6 +218,9 @@ <widgettype> image </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/rtf"> <label name="application/rtf_label"> @@ -223,14 +229,20 @@ <widgettype> image </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/smil"> <label name="application/smil_label"> - Synchronized Multimedia Integration Language (SMIL) + Synchronized Multimedia Integration Language (SMIL) </label> <widgettype> movie </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/xhtml+xml"> <label name="application/xhtml+xml_label"> @@ -239,6 +251,9 @@ <widgettype> web </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="application/x-director"> <label name="application/x-director_label"> @@ -247,14 +262,9 @@ <widgettype> image </widgettype> - </mimetype> - <mimetype name="application/x-shockwave-flash"> - <label name="application/x-shockwave-flash_label"> - Flash - </label> - <widgettype> - image - </widgettype> + <impl> + media_plugin_webkit + </impl> </mimetype> <mimetype name="audio/mid"> <label name="audio/mid_label"> @@ -263,6 +273,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="audio/mpeg"> <label name="audio/mpeg_label"> @@ -271,6 +284,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="audio/x-aiff"> <label name="audio/x-aiff_label"> @@ -279,6 +295,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype name="audio/x-wav"> <label name="audio/x-wav_label"> @@ -287,6 +306,9 @@ <widgettype> audio </widgettype> + <impl> + media_plugin_quicktime + </impl> </mimetype> <mimetype menu="1" name="image/bmp"> <label name="image/bmp_label"> @@ -296,7 +318,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="image/gif"> @@ -307,7 +329,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="image/jpeg"> @@ -318,7 +340,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="image/png"> @@ -329,7 +351,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype name="image/svg+xml"> @@ -340,7 +362,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="image/tiff"> @@ -351,7 +373,7 @@ image </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="text/html"> @@ -362,7 +384,7 @@ web </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="text/plain"> @@ -373,7 +395,7 @@ text </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype name="text/xml"> @@ -384,7 +406,7 @@ text </widgettype> <impl> - LLMediaImplLLMozLib + media_plugin_webkit </impl> </mimetype> <mimetype menu="1" name="video/mpeg"> @@ -395,7 +417,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype name="video/mp4"> @@ -406,7 +428,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype menu="1" name="video/quicktime"> @@ -417,7 +439,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype name="video/x-ms-asf"> @@ -428,7 +450,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype name="video/x-ms-wmv"> @@ -439,7 +461,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> <mimetype menu="1" name="video/x-msvideo"> @@ -450,7 +472,7 @@ movie </widgettype> <impl> - LLMediaImplQuickTime + media_plugin_quicktime </impl> </mimetype> </mimetypes> diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml new file mode 100644 index 0000000000..e95b371d00 --- /dev/null +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml @@ -0,0 +1,478 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<mimetypes name="default"> + <defaultlabel> + (Unknown) + </defaultlabel> + <defaultwidget> + none + </defaultwidget> + <defaultimpl> + media_plugin_webkit + </defaultimpl> + <widgetset name="web"> + <label name="web_label"> + Web Content + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + text/html + </default_type> + <tooltip name="web_tooltip"> + This location has Web content + </tooltip> + <playtip name="web_playtip"> + Show Web content + </playtip> + <allow_resize> + true + </allow_resize> + <allow_looping> + false + </allow_looping> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Movie + </label> + <default_type> + video/* + </default_type> + <icon> + icn_media_movie.tga + </icon> + <tooltip name="movie_tooltip"> + There is a movie to play here + </tooltip> + <playtip name="movie_playtip"> + Play movie + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + true + </allow_looping> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Image + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + image/* + </default_type> + <tooltip name="image_tooltip"> + There is an image at this location + </tooltip> + <playtip name="image_playtip"> + View this location's image + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + false + </allow_looping> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + audio/* + </default_type> + <tooltip name="audio_tooltip"> + There is audio at this location + </tooltip> + <playtip name="audio_playtip"> + Play this location's audio + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + true + </allow_looping> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Real Time Streaming + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - None - + </label> + <widgettype> + none + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - None - + </label> + <widgettype> + none + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + Video + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Image + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + Movie (QuickTime) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Audio/Video + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + PDF Document + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Postscript Document + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Rich Text (RTF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Synchronized Multimedia Integration Language (SMIL) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Web Page (XHTML) + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype menu="1" name="image/bmp"> + <label name="image/bmp_label"> + Image (BMP) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/gif"> + <label name="image/gif_label"> + Image (GIF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/jpeg"> + <label name="image/jpeg_label"> + Image (JPEG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/png"> + <label name="image/png_label"> + Image (PNG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Image (SVG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/tiff"> + <label name="image/tiff_label"> + Image (TIFF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="text/html"> + <label name="text/html_label"> + Web Page + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="text/plain"> + <label name="text/plain_label"> + Text + </label> + <widgettype> + text + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + <widgettype> + text + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="video/mpeg"> + <label name="video/mpeg_label"> + Movie (MPEG) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + Movie (MP4) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype menu="1" name="video/quicktime"> + <label name="video/quicktime_label"> + Movie (QuickTime) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + Movie (Windows Media ASF) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + Movie (Windows Media WMV) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> + <mimetype menu="1" name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + Movie (AVI) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml new file mode 100644 index 0000000000..7931e55c0a --- /dev/null +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml @@ -0,0 +1,478 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<mimetypes name="default"> + <defaultlabel> + (Unknown) + </defaultlabel> + <defaultwidget> + none + </defaultwidget> + <defaultimpl> + media_plugin_webkit + </defaultimpl> + <widgetset name="web"> + <label name="web_label"> + Web Content + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + text/html + </default_type> + <tooltip name="web_tooltip"> + This location has Web content + </tooltip> + <playtip name="web_playtip"> + Show Web content + </playtip> + <allow_resize> + true + </allow_resize> + <allow_looping> + false + </allow_looping> + </widgetset> + <widgetset name="movie"> + <label name="movie_label"> + Movie + </label> + <default_type> + video/* + </default_type> + <icon> + icn_media_movie.tga + </icon> + <tooltip name="movie_tooltip"> + There is a movie to play here + </tooltip> + <playtip name="movie_playtip"> + Play movie + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + true + </allow_looping> + </widgetset> + <widgetset name="image"> + <label name="image_label"> + Image + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + image/* + </default_type> + <tooltip name="image_tooltip"> + There is an image at this location + </tooltip> + <playtip name="image_playtip"> + View this location's image + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + false + </allow_looping> + </widgetset> + <widgetset name="audio"> + <label name="audio_label"> + Audio + </label> + <icon> + icn_media_web.tga + </icon> + <default_type> + audio/* + </default_type> + <tooltip name="audio_tooltip"> + There is audio at this location + </tooltip> + <playtip name="audio_playtip"> + Play this location's audio + </playtip> + <allow_resize> + false + </allow_resize> + <allow_looping> + true + </allow_looping> + </widgetset> + <scheme name="rtsp"> + <label name="rtsp_label"> + Real Time Streaming + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </scheme> + <mimetype name="blank"> + <label name="blank_label"> + - None - + </label> + <widgettype> + none + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="none/none"> + <label name="none/none_label"> + - None - + </label> + <widgettype> + none + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="audio/*"> + <label name="audio2_label"> + Audio + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="video/*"> + <label name="video2_label"> + Video + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="image/*"> + <label name="image2_label"> + Image + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> + <label name="vnd.secondlife.qt.legacy_label"> + Movie (QuickTime) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="application/javascript"> + <label name="application/javascript_label"> + Javascript + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/ogg"> + <label name="application/ogg_label"> + Ogg Audio/Video + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="application/pdf"> + <label name="application/pdf_label"> + PDF Document + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/postscript"> + <label name="application/postscript_label"> + Postscript Document + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/rtf"> + <label name="application/rtf_label"> + Rich Text (RTF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/smil"> + <label name="application/smil_label"> + Synchronized Multimedia Integration Language (SMIL) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/xhtml+xml"> + <label name="application/xhtml+xml_label"> + Web Page (XHTML) + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="application/x-director"> + <label name="application/x-director_label"> + Macromedia Director + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="audio/mid"> + <label name="audio/mid_label"> + Audio (MIDI) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="audio/mpeg"> + <label name="audio/mpeg_label"> + Audio (MP3) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="audio/x-aiff"> + <label name="audio/x-aiff_label"> + Audio (AIFF) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="audio/x-wav"> + <label name="audio/x-wav_label"> + Audio (WAV) + </label> + <widgettype> + audio + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype menu="1" name="image/bmp"> + <label name="image/bmp_label"> + Image (BMP) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/gif"> + <label name="image/gif_label"> + Image (GIF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/jpeg"> + <label name="image/jpeg_label"> + Image (JPEG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/png"> + <label name="image/png_label"> + Image (PNG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="image/svg+xml"> + <label name="image/svg+xml_label"> + Image (SVG) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="image/tiff"> + <label name="image/tiff_label"> + Image (TIFF) + </label> + <widgettype> + image + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="text/html"> + <label name="text/html_label"> + Web Page + </label> + <widgettype> + web + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="text/plain"> + <label name="text/plain_label"> + Text + </label> + <widgettype> + text + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype name="text/xml"> + <label name="text/xml_label"> + XML + </label> + <widgettype> + text + </widgettype> + <impl> + media_plugin_webkit + </impl> + </mimetype> + <mimetype menu="1" name="video/mpeg"> + <label name="video/mpeg_label"> + Movie (MPEG) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="video/mp4"> + <label name="video/mp4_label"> + Movie (MP4) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype menu="1" name="video/quicktime"> + <label name="video/quicktime_label"> + Movie (QuickTime) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="video/x-ms-asf"> + <label name="video/x-ms-asf_label"> + Movie (Windows Media ASF) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="video/x-ms-wmv"> + <label name="video/x-ms-wmv_label"> + Movie (Windows Media WMV) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype menu="1" name="video/x-msvideo"> + <label name="video/x-msvideo_label"> + Movie (AVI) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_quicktime + </impl> + </mimetype> +</mimetypes> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 47b21dc64d..e1aecda151 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1,6 +1,5 @@ <?xml version="1.0" ?><notifications> - - <global name="skipnexttime"> + <global name="skipnexttime"> Don't show me this again </global> @@ -13,13 +12,13 @@ <global name="implicitclosebutton"> Close </global> - + <template name="okbutton"> <form> <button default="true" index="0" - name="OK" + name="OK_okbutton" text="$yestext"/> </form> </template> @@ -29,7 +28,7 @@ <button default="true" index="0" - name="OK" + name="OK_okignore" text="$yestext"/> <ignore text="$ignoretext"/> </form> @@ -40,11 +39,11 @@ <button default="true" index="0" - name="OK" + name="OK_okcancelbuttons" text="$yestext"/> <button index="1" - name="Cancel" + name="Cancel_okcancelbuttons" text="$notext"/> </form> </template> @@ -54,11 +53,11 @@ <button default="true" index="0" - name="OK" + name="OK_okcancelignore" text="$yestext"/> <button index="1" - name="Cancel" + name="Cancel_okcancelignore" text="$notext"/> <ignore text="$ignoretext"/> </form> @@ -69,7 +68,7 @@ <button default="true" index="0" - name="OK" + name="OK_okhelpbuttons" text="$yestext"/> <button index="1" @@ -91,20 +90,20 @@ text="$notext"/> <button index="2" - name="Cancel" + name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification - functor="GenericAcknowledge" + functor="GenericAcknowledge" icon="alertmodal.tga" name="MissingAlert" - label="Unknown Alert Message" + label="Unknown Notification Message" type="alertmodal"> -Your version of Second Life does not know how to display the alert message it just received. +Your version of [APP_NAME] does not know how to display the notification it just received. Please verify that you have the latest Viewer installed. -Error details: The alert called '[_NAME]' was not found in notifications.xml. +Error details: The notification called '[_NAME]' was not found in notifications.xml. <usetemplate name="okbutton" yestext="OK"/> @@ -154,22 +153,22 @@ No tutorial is currently available. icon="alertmodal.tga" name="BadInstallation" type="alertmodal"> -An error occurred while updating Second Life. Please download the latest version from secondlife.com. + An error occurred while updating [APP_NAME]. Please [http://get.secondlife.com download the latest version] of the Viewer. <usetemplate name="okbutton" - yestext="Ok"/> + yestext="OK"/> </notification> <notification icon="alertmodal.tga" name="LoginFailedNoNetwork" type="alertmodal"> -Network Error: Could not establish a connection. +Could not connect to the [SECOND_LIFE_GRID]. '[DIAGNOSTIC]' -Please check your network connection. +Make sure your Internet connection is working properly. <usetemplate name="okbutton" - yestext="Ok"/> + yestext="OK"/> </notification> <notification @@ -179,7 +178,7 @@ Please check your network connection. Message Template [PATH] not found. <usetemplate name="okbutton" - yestext="Ok"/> + yestext="OK"/> </notification> <notification @@ -244,9 +243,19 @@ Save all changes to clothing/body parts? <notification icon="alertmodal.tga" + name="FriendsAndGroupsOnly" + type="alertmodal"> + Non-friends won't know that you've choosen to ignore their calls and instant messages. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + 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 +267,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" @@ -331,7 +340,7 @@ Members cannot be removed from that role. The members must resign from the role themselves. Are you sure you want to continue? <usetemplate - ignoretext="When adding group members to the owner role" + ignoretext="Confirm before I add a new group Owner" name="okcancelignore" notext="No" yestext="Yes"/> @@ -371,109 +380,61 @@ Add this Ability to '[ROLE_NAME]'? <notification icon="alertmodal.tga" - name="ClickPublishHelpLand" + name="AttachmentDrop" type="alertmodal"> -Selecting the "Publish in Search" -Checking this box will show: -- this parcel in search results -- this parcel's public objects -- this parcel in web search - </notification> - - <notification - icon="alertmodal.tga" - name="ClickSoundHelpLand" - type="alertmodal">Media and Music can only be experienced within the parcel. Sound and Voice options can be restricted to the parcel or will be heard by residents outside the parcel depending on their maturity Rating. Go to Knowledge Base to learn more about how to set these options? - <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=5046 - </url> + You are about to drop your attachment. + Are you sure you want to continue? <usetemplate - name="okcancelbuttons" - yestext="Go to Knowledge Base" - notext="Close" /> + ignoretext="Confirm before dropping attachments" + name="okcancelignore" + notext="No" + yestext="Yes"/> </notification> - <notification icon="alertmodal.tga" - name="ClickSearchHelpAll" + name="JoinGroupCanAfford" type="alertmodal"> -Search results are organized based on the tab you are in, your maturity Rating, the category chosen, and other factors. For more details, please see the Knowledge Base. - <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4722 - </url> +Joining this group costs L$[COST]. +Do you wish to proceed? <usetemplate name="okcancelbuttons" - yestext="Go to Knowledge Base" - notext="Close" /> - </notification> - - <notification - icon="alertmodal.tga" - name="ClickPublishHelpLandDisabled" - type="alertmodal"> -You can't make this parcel show in search because it is located in a region that forbids this. - </notification> - - <notification - icon="alertmodal.tga" - name="ClickPublishHelpAvatar" - type="alertmodal"> -Selecting "Show in Search" will show: -- my profile in search results -- a link to my profile in public group pages + notext="Cancel" + yestext="Join"/> </notification> <notification icon="alertmodal.tga" - name="ClickPartnerHelpAvatar" + name="JoinGroupNoCost" type="alertmodal"> -You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website. - -Go to the Second Life web site for more information on partnering? +You are joining group [NAME]. +Do you wish to proceed? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Go to Page"/> + yestext="Join"/> </notification> - <notification - icon="alertmodal.tga" - name="ClickUploadHelpPermissions" - type="alertmodal"> -Your default permissions may not work in older regions. - </notification> <notification icon="alertmodal.tga" - name="ClickWebProfileHelpAvatar" + name="JoinGroupCannotAfford" type="alertmodal"> -If this Resident has set a web profile URL then you can: - * Click 'Load' to see the page in this Web tab. - * Click Load > 'In external browser' to view the page in your default web browser. - * Click Load > 'Home URL' to return to this Resident's web profile if you've navigated away. - -When viewing your own profile, you can enter any URL as your web profile and click OK to set it. -Other residents can visit the URL you set when they look at your profile. +Joining this group costs L$[COST]. +You do not have enough L$ to join this group. </notification> <notification icon="alertmodal.tga" - name="JoinGroupCanAfford" + name="CreateGroupCost" type="alertmodal"> -Joining this group costs L$[COST]. -Do you wish to proceed? +Creating this group will cost L$100. +Groups need more than one member, or they are deleted forever. +Please invite members within 48 hours. <usetemplate + canceltext="Cancel" name="okcancelbuttons" notext="Cancel" - yestext="Join"/> - </notification> - - <notification - icon="alertmodal.tga" - name="JoinGroupCannotAfford" - type="alertmodal"> -Joining this group costs L$[COST]. -You do not have enough L$ to join this group. + yestext="Create group for L$100"/> </notification> <notification @@ -512,7 +473,7 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA icon="alertmodal.tga" name="ConfirmLandSaleToAnyoneChange" type="alertmodal"> -ATTENTION: Clicking 'sell to anyone' makes your land available to the entire Second Life community, even those not in this region. +ATTENTION: Clicking 'sell to anyone' makes your land available to the entire [SECOND_LIFE] community, even those not in this region. The selected [LAND_SIZE] m² land is being set for sale. Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME]. @@ -639,6 +600,20 @@ This entire region is damage enabled. Scripts must be allowed to run for weapons to work. </notification> +<notification + icon="alertmodal.tga" + name="MultipleFacesSelected" + type="alertmodal"> +Multiple faces are currently selected. +If you continue this action, separate instances of media will be set on multiple faces of the object. +To place the media on only one face, choose Select Face and click on the desired face of that object then click Add. + <usetemplate + ignoretext="Media will be set on multiple selected faces" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + <notification icon="alertmodal.tga" name="MustBeInParcel" @@ -723,6 +698,14 @@ You can not wear clothes or body parts that are in the trash <notification icon="alertmodal.tga" + name="MaxAttachmentsOnOutfit" + type="alertmodal"> +Could not attach object. +Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first. + </notification> + + <notification + icon="alertmodal.tga" name="CannotWearInfoNotComplete" type="alertmodal"> You can not wear that item because it has not yet loaded. Please try again in a minute. @@ -736,11 +719,12 @@ Oops! Something was left blank. You need to enter both the First and Last name of your avatar. You need an account to enter [SECOND_LIFE]. Would you like to create one now? - <url + <url option="0" - openexternally = "1"> + name="url" + target = "_external"> - http://secondlife.com/registration/ + http://join.secondlife.com/ </url> <usetemplate name="okcancelbuttons" @@ -750,14 +734,22 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? <notification icon="alertmodal.tga" + name="InvalidCredentialFormat" + type="alertmodal"> +You need to enter both the First and Last name of your avatar into the Username field, then login again. + </notification> + + + <notification + icon="alertmodal.tga" name="AddClassified" type="alertmodal"> -Classified ads appear in the 'Classified' section of the Search directory and on www.secondlife.com for one week. +Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. Fill out your ad, then click 'Publish...' to add it to the directory. You'll be asked for a price to pay when clicking Publish. Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords. <usetemplate - ignoretext="When adding a new Classified" + ignoretext="How to create a new Classified ad" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -775,6 +767,20 @@ There is no reimbursement for fees paid. yestext="OK"/> </notification> + +<notification + icon="alertmodal.tga" + name="DeleteMedia" + type="alertmodal"> +You have selected to delete the media associated with this face. +Are you sure you want to continue? + <usetemplate + ignoretext="Confirm before I delete media from an object" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> + <notification icon="alertmodal.tga" name="ClassifiedSave" @@ -789,9 +795,30 @@ Save changes to classified [NAME]? <notification icon="alertmodal.tga" + name="ClassifiedInsufficientFunds" + type="alertmodal"> +Insufficient funds to create classified. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="DeleteAvatarPick" type="alertmodal"> -Delete pick [PICK]? +Delete pick <nolink>[PICK]</nolink>? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="DeleteOutfits" + type="alertmodal"> + Delete the selected outfit? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -803,7 +830,7 @@ Delete pick [PICK]? name="PromptGoToEventsPage" type="alertmodal"> Go to the [SECOND_LIFE] events web page? - <url option="0"> + <url option="0" name="url"> http://secondlife.com/events/ </url> @@ -827,6 +854,7 @@ Please select a proposal to view. Please select a history item to view. </notification> +<!-- <notification icon="alertmodal.tga" name="ResetShowNextTimeDialogs" @@ -848,19 +876,20 @@ Would you like to disable all popups which can be skipped? notext="Cancel" yestext="OK"/> </notification> +--> <notification icon="alertmodal.tga" name="CacheWillClear" type="alertmodal"> -Cache will be cleared after you restart [SECOND_LIFE]. +Cache will be cleared after you restart [APP_NAME]. </notification> <notification icon="alertmodal.tga" name="CacheWillBeMoved" type="alertmodal"> -Cache will be moved after you restart [SECOND_LIFE]. +Cache will be moved after you restart [APP_NAME]. Note: This will clear the cache. </notification> @@ -868,14 +897,14 @@ Note: This will clear the cache. icon="alertmodal.tga" name="ChangeConnectionPort" type="alertmodal"> -Port settings take effect after you restart [SECOND_LIFE]. +Port settings take effect after you restart [APP_NAME]. </notification> <notification icon="alertmodal.tga" name="ChangeSkin" type="alertmodal"> -The new skin will appear after you restart [SECOND_LIFE]. +The new skin will appear after you restart [APP_NAME]. </notification> <notification @@ -883,7 +912,7 @@ The new skin will appear after you restart [SECOND_LIFE]. name="GoToAuctionPage" type="alertmodal"> Go to the [SECOND_LIFE] web page to see auction details or make a bid? - <url option="0"> + <url option="0" name="url"> http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID] </url> @@ -988,6 +1017,17 @@ There was a problem saving a compiled script due to the following reason: [REASO <notification icon="alertmodal.tga" + name="StartRegionEmpty" + type="alertmodal"> +Oops, Your Start Region is not defined. +Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="CouldNotStartStopScript" type="alertmodal"> Could not start or stop the script because the object it is on could not be found. @@ -1012,16 +1052,15 @@ Unable to write file [[FILE]] icon="alertmodal.tga" name="UnsupportedHardware" type="alertmodal"> -Warning: Your system does not meet Second Life's minimum system requirements. If you continue using Second Life, you may experience poor performance. Unfortunately, we cannot provide technical support for unsupported system configurations. +Just so you know, your computer does not meet [APP_NAME]'s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can't provide technical support for unsupported system configurations. -MINSPECS -Do you wish to visit [_URL] for more information? +Visit [_URL] for more information? <url option="0" name="url"> http://www.secondlife.com/corporate/sysreqs.php </url> <usetemplate - ignoretext="When detecting unsupported hardware" + ignoretext="My computer hardware is not supported" name="okcancelignore" notext="No" yestext="Yes"/> @@ -1031,12 +1070,12 @@ Do you wish to visit [_URL] for more information? icon="alertmodal.tga" name="UnknownGPU" type="alertmodal"> -Your system contains a graphics card that is unknown to us at this time. -This is often the case with new hardware we haven't had a chance to test. Second Life will most likely run properly, but you may need to adjust your graphics settings to something more appropriate. -(Edit menu > Preferences > Graphics). +Your system contains a graphics card that [APP_NAME] doesn't recognize. +This is often the case with new hardware that hasn't been tested yet with [APP_NAME]. It will probably be ok, but you may need to adjust your graphics settings. +(Me > Preferences > Graphics). <form name="form"> <ignore name="ignore" - text="When detecting an unknown graphics card"/> + text="My graphics card could not be identified"/> </form> </notification> @@ -1044,9 +1083,8 @@ This is often the case with new hardware we haven't had a chance to test. icon="alertmodal.tga" name="DisplaySettingsNoShaders" type="alertmodal"> -[SECOND_LIFE] crashed while initializing graphics drivers. -Graphics Quality will be set to low to avoid some common driver errors. -This will disable some graphics features. +[APP_NAME] crashed while initializing graphics drivers. +Graphics Quality will be set to Low to avoid some common driver errors. This will disable some graphics features. We recommend updating your graphics card drivers. Graphics Quality can be raised in Preferences > Graphics. </notification> @@ -1062,7 +1100,9 @@ The region [REGION] does not allow terraforming. icon="alertmodal.tga" name="CannotCopyWarning" type="alertmodal"> -You do not have permission to copy this item and will lose it from your inventory if you give it away. Do you really want to offer this item? +You do not have permission to copy the following items: +[ITEMS] +and will lose it from your inventory if you give it away. Do you really want to offer these items? <usetemplate name="okcancelbuttons" notext="No" @@ -1178,6 +1218,14 @@ Eject [AVATAR_NAME] from your land? <notification icon="alertmodal.tga" + name="EjectAvatarFromGroup" + persist="true" + type="notify"> +You ejected [AVATAR_NAME] from group [GROUP_NAME] + </notification> + + <notification + icon="alertmodal.tga" name="AcquireErrorTooManyObjects" type="alertmodal"> ACQUIRE ERROR: Too many objects selected. @@ -1197,8 +1245,8 @@ Please move all objects to be acquired onto the same region. type="alertmodal"> [EXTRA] -Go to [_URL] for information on purchasing currency? - <url option="0"> +Go to [_URL] for information on purchasing L$? + <url option="0" name="url"> http://secondlife.com/app/currency/ </url> @@ -1357,6 +1405,17 @@ Unable to encode file: [FILE] <notification icon="alertmodal.tga" + name="CorruptedProtectedDataStore" + type="alertmodal"> + We can't fill in your username and password. This may happen when you change network setup + + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="CorruptResourceFile" type="alertmodal"> Corrupt resource file: [FILE] @@ -1380,7 +1439,7 @@ Unable to create output file: [FILE] icon="alertmodal.tga" name="DoNotSupportBulkAnimationUpload" type="alertmodal"> -We do not currently support bulk upload of animation files. +[APP_NAME] does not currently support bulk upload of animation files. </notification> <notification @@ -1399,6 +1458,16 @@ You have added "[LANDMARK_NAME]" to your [FOLDER_NAME] folder. </notification> <notification + icon="alert.tga" + name="LandmarkAlreadyExists" + type="alert"> +You already have a landmark for this location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" name="CannotCreateLandmarkNotOwner" type="alertmodal"> @@ -1442,6 +1511,13 @@ Select objects with scripts that you have permission to modify. <notification icon="alertmodal.tga" + name="CannotOpenScriptObjectNoMod" + type="alertmodal"> + Unable to open script in object without modify permissions. + </notification> + + <notification + icon="alertmodal.tga" name="CannotSetRunningSelectObjectsNoScripts" type="alertmodal"> Not able to set any scripts to 'running'. @@ -1487,7 +1563,7 @@ Your search terms were too short so no search was performed. icon="alertmodal.tga" name="CouldNotTeleportReason" type="alertmodal"> -Could not teleport. +Teleport failed. [REASON] </notification> @@ -1499,15 +1575,15 @@ Could not teleport. icon="alertmodal.tga" name="invalid_tport" type="alertmodal"> -Problem encountered processing your teleport request. You may need to log back in before you can teleport. If you continue to get this message, please check the Tech Support FAQ at: -www.secondlife.com/support +Problem encountered processing your teleport request. You may need to log back in before you can teleport. +If you continue to get this message, please check the [SUPPORT_SITE]. </notification> <notification icon="alertmodal.tga" name="invalid_region_handoff" type="alertmodal"> -Problem encountered processing your region crossing. You may need to log back in before you can cross regions. If you continue to get this message, please check the Tech Support FAQ at: -www.secondlife.com/support +Problem encountered processing your region crossing. You may need to log back in before you can cross regions. +If you continue to get this message, please check the [SUPPORT_SITE]. </notification> <notification icon="alertmodal.tga" @@ -1589,7 +1665,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" @@ -1648,7 +1725,7 @@ Cannot find the region this land is in. icon="alertmodal.tga" name="CannotCloseFloaterBuyLand" type="alertmodal"> -You cannot close the Buy Land window until Second Life estimates the price of this transaction. +You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction. </notification> <notification @@ -1673,7 +1750,6 @@ No Group selected. type="alertmodal"> Unable to deed land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. </notification> <notification @@ -1688,21 +1764,6 @@ Try selecting a single parcel. <notification icon="alertmodal.tga" - name="ParcelCanPlayMedia" - type="alertmodal"> -This location can play streaming media. -Streaming media requires a fast Internet connection. - -Play streaming media when available? -(You can change this option later under Preferences > Audio & Video.) - <usetemplate - name="okcancelbuttons" - notext="Disable" - yestext="Play Media"/> - </notification> - - <notification - icon="alertmodal.tga" name="CannotDeedLandWaitingForServer" type="alertmodal"> Unable to deed land: @@ -1754,8 +1815,6 @@ Parcels you own appear in green. type="alertmodal"> Unable to abandon land: Cannot find the region this land is in. - -Please use Tools -> Report Bug to report this. </notification> <notification @@ -1828,8 +1887,6 @@ Divide land? type="alertmodal"> Unable to divide land: Cannot find the region this land is in. - -Please use Tools -> Report Bug to report this. </notification> <notification @@ -1838,8 +1895,6 @@ Please use Tools -> Report Bug to report this. type="alertmodal"> Unable to join land: Cannot find the region this land is in. - -Please use Tools -> Report Bug to report this. </notification> <notification @@ -1886,21 +1941,6 @@ Join land? <notification icon="alertmodal.tga" - name="ShowOwnersHelp" - type="alertmodal"> -Show owners: -Color parcels to show the owner type. - -Green = Your land -Aqua = Your Group's land -Red = Owned by others -Yellow = For sale -Purple = For auction -Grey = Public - </notification> - - <notification - icon="alertmodal.tga" name="ConfirmNotecardSave" type="alertmodal"> This notecard needs to be saved before the item can be copied or viewed. Save notecard? @@ -1955,18 +1995,14 @@ Unable to save '[NAME]' to wearable file. You will need to free up so type="alertmodal"> Unable to save [NAME] to central asset store. This is usually a temporary failure. Please customize and save the wearable again in a few minutes. - -If this problem persists, please click on the 'Tools > Report Bug' pull down menu -and provide details about your network setup. </notification> <notification icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -You have been logged out of [SECOND_LIFE]: +Darn. You have been logged out of [SECOND_LIFE] [MESSAGE] -You can still look at existing IM and chat by clicking 'View IM & Chat'. Otherwise, click 'Quit' to exit [SECOND_LIFE] immediately. <usetemplate name="okcancelbuttons" notext="Quit" @@ -1996,8 +2032,8 @@ Offer friendship to [NAME]? </notification> <notification - icon="alertmodal.tga" - label="Add Friend" + icon="alertmodal.tga" + label="Add Friend" name="AddFriendWithMessage" type="alertmodal"> Friends can give permissions to track each other on the map and receive online status updates. @@ -2020,6 +2056,74 @@ Would you be my friend? </notification> <notification + icon="alertmodal.tga" + label="Save Outfit" + name="SaveOutfitAs" + type="alertmodal" + unique="true"> + Save what I'm wearing as a new Outfit: + <form name="form"> + <input name="message" type="text"> + [DESC] (new) + </input> + <button + default="true" + index="0" + name="Offer" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + label="Save Wearable" + name="SaveWearableAs" + type="alertmodal"> + Save item to my inventory as: + <form name="form"> + <input name="message" type="text"> + [DESC] (new) + </input> + <button + default="true" + index="0" + name="Offer" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + + <notification + icon="alertmodal.tga" + label="Rename Outfit" + name="RenameOutfit" + type="alertmodal"> + New outfit name: + <form name="form"> + <input name="new_name" type="text" width="300"> + [NAME] + </input> + <button + default="true" + index="0" + name="Offer" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification icon="alertmodal.tga" name="RemoveFromFriends" type="alertmodal"> @@ -2098,6 +2202,19 @@ Please enter a higher price. <notification icon="alertmodal.tga" + name="ConfirmItemDeleteHasLinks" + type="alertmodal"> +At least one of the items you has link items that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. + +Are you sure you want to delete these items? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmObjectDeleteLock" type="alertmodal"> At least one of the items you have selected is locked. @@ -2292,6 +2409,9 @@ Display settings have been set to recommended levels based on your system config name="ErrorMessage" type="alertmodal"> [ERROR_MESSAGE] + <usetemplate + name="okbutton" + yestext="OK"/> </notification> <notification @@ -2324,10 +2444,10 @@ You may want to set a new home location. name="ClothingLoading" type="alertmodal"> Your clothing is still downloading. -You can use [SECOND_LIFE] normally and other users will see you correctly. +You can use [SECOND_LIFE] normally and other people will see you correctly. <form name="form"> <ignore name="ignore" - text="When clothing is taking a long time to download"/> + text="Clothing is taking a long time to download"/> </form> </notification> @@ -2335,10 +2455,11 @@ You can use [SECOND_LIFE] normally and other users will see you correctly. icon="alertmodal.tga" name="FirstRun" type="alertmodal"> -[SECOND_LIFE] installation is complete. -If this is your first time using [SECOND_LIFE], you will need to create an account before you can log on. -Return to www.secondlife.com to create a new account? +[APP_NAME] installation is complete. + +If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in. +Return to [http://join.secondlife.com secondlife.com] to create a new account? <usetemplate name="okcancelbuttons" notext="Continue" @@ -2349,13 +2470,13 @@ Return to www.secondlife.com to create a new account? icon="alertmodal.tga" name="LoginPacketNeverReceived" type="alertmodal"> -We're having trouble connecting. There may be a problem with your internet connection or the Second Life servers. +We're having trouble connecting. There may be a problem with your Internet connection or the [SECOND_LIFE_GRID]. -You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home. - <url option="1"> +You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home. + <url option="1" name="url"> http://secondlife.com/support/ - </url> + </url> <form name="form"> <button default="true" @@ -2387,6 +2508,57 @@ Please choose the male or female avatar. You can change your mind later. notext="Female" yestext="Male"/> </notification> + <notification icon="alertmodal.tga" + name="CantTeleportToGrid" + type="alertmodal"> +Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]). Please close your viewer and try again. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" + name="GeneralCertificateError" + type="alertmodal"> +Could not connect to the server. +[REASON] + +SubjectName: [SUBJECT_NAME_STRING] +IssuerName: [ISSUER_NAME_STRING] +Valid From: [VALID_FROM] +Valid To: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" + name="TrustCertificateError" + type="alertmodal"> +The certification authority for this server is not known. + +Certificate Information: +SubjectName: [SUBJECT_NAME_STRING] +IssuerName: [ISSUER_NAME_STRING] +Valid From: [VALID_FROM] +Valid To: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + +Would you like to trust this authority? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Trust"/> + </notification> <notification icon="alertmodal.tga" @@ -2398,15 +2570,17 @@ Please choose the male or female avatar. You can change your mind later. <notification icon="alertmodal.tga" name="GrantedModifyRights" - type="alertmodal"> -You have been granted the privilege to modify [FIRST_NAME] [LAST_NAME]'s objects. + persist="true" + type="notify"> +[NAME] has given you permission to edit their objects. </notification> <notification icon="alertmodal.tga" name="RevokedModifyRights" - type="alertmodal"> -Your privilege to modify [FIRST_NAME] [LAST_NAME]'s objects has been revoked + persist="true" + type="notify"> +Your privilege to modify [NAME]'s objects has been revoked </notification> <notification @@ -2582,9 +2756,9 @@ Finished download of raw terrain file to: icon="alertmodal.tga" name="DownloadWindowsMandatory" type="alertmodal"> -A new version of [SECOND_LIFE] is available. +A new version of [APP_NAME] is available. [MESSAGE] -You must download this update to use [SECOND_LIFE]. +You must download this update to use [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Quit" @@ -2595,7 +2769,7 @@ You must download this update to use [SECOND_LIFE]. icon="alertmodal.tga" name="DownloadWindows" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -2608,7 +2782,46 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadWindowsReleaseForDownload" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. +[MESSAGE] +This update is not required, but we suggest you install it to improve performance and stability. + <usetemplate + name="okcancelbuttons" + notext="Continue" + yestext="Download"/> + </notification> + + <notification + icon="alertmodal.tga" + name="DownloadLinuxMandatory" + type="alertmodal"> +A new version of [APP_NAME] is available. +[MESSAGE] +You must download this update to use [APP_NAME]. + <usetemplate + name="okcancelbuttons" + notext="Quit" + yestext="Download"/> + </notification> + + <notification + icon="alertmodal.tga" + name="DownloadLinux" + type="alertmodal"> +An updated version of [APP_NAME] is available. +[MESSAGE] +This update is not required, but we suggest you install it to improve performance and stability. + <usetemplate + name="okcancelbuttons" + notext="Continue" + yestext="Download"/> + </notification> + + <notification + icon="alertmodal.tga" + name="DownloadLinuxReleaseForDownload" + type="alertmodal"> +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -2621,9 +2834,9 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadMacMandatory" type="alertmodal"> -A new version of [SECOND_LIFE] is available. +A new version of [APP_NAME] is available. [MESSAGE] -You must download this update to use [SECOND_LIFE]. +You must download this update to use [APP_NAME]. Download to your Applications folder? <usetemplate @@ -2636,7 +2849,7 @@ Download to your Applications folder? icon="alertmodal.tga" name="DownloadMac" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. @@ -2651,7 +2864,7 @@ Download to your Applications folder? icon="alertmodal.tga" name="DownloadMacReleaseForDownload" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. @@ -2669,7 +2882,7 @@ Download to your Applications folder? Deeding this object will cause the group to: * Receive L$ paid into the object <usetemplate - ignoretext="When deeding objects to groups" + ignoretext="Confirm before I deed an object to a group" name="okcancelignore" notext="Cancel" yestext="Deed"/> @@ -2679,9 +2892,9 @@ Deeding this object will cause the group to: icon="alertmodal.tga" name="WebLaunchExternalTarget" type="alertmodal"> -Open your system Web browser to view this content? +Do you want to open your Web browser to view this content? <usetemplate - ignoretext="When opening your system browser to view a Web page" + ignoretext="Launch my browser to view a web page" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2691,21 +2904,9 @@ Open your system Web browser to view this content? icon="alertmodal.tga" name="WebLaunchJoinNow" type="alertmodal"> -Go to www.secondlife.com to manage your account? - <usetemplate - ignoretext="When launching web browser to manage your account" - name="okcancelignore" - notext="Cancel" - yestext="OK"/> - </notification> - - <notification - icon="alertmodal.tga" - name="WebLaunchBugReport101" - type="alertmodal"> -Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly. +Go to your [http://secondlife.com/account/ Dashboard] to manage your account? <usetemplate - ignoretext="When launching web browser to view the Bug Reporting 101 Wiki" + ignoretext="Launch my browser to manage my account" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2717,7 +2918,7 @@ Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly. type="alertmodal"> Visit the [SECOND_LIFE] Wiki for details of how to report a security issue. <usetemplate - ignoretext="When launching web browser to view Security Issues Wiki" + ignoretext="Launch my browser to learn how to report a Security Issue" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2729,7 +2930,7 @@ Visit the [SECOND_LIFE] Wiki for details of how to report a security issue. type="alertmodal"> Visit the [SECOND_LIFE] QA Wiki. <usetemplate - ignoretext="When launching web browser to view the QA Wiki" + ignoretext="Launch my browser to view the QA Wiki" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2741,19 +2942,7 @@ Visit the [SECOND_LIFE] QA Wiki. type="alertmodal"> Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues. <usetemplate - ignoretext="When launching web browser to view the Public Issue Tracker" - name="okcancelignore" - notext="Cancel" - yestext="Go to page"/> - </notification> - - <notification - icon="alertmodal.tga" - name="WebLaunchPublicIssueHelp" - type="alertmodal"> -Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker. - <usetemplate - ignoretext="When launching web browser to view Public Issue Tracker Wiki" + ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="Cancel" yestext="Go to page"/> @@ -2765,7 +2954,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker. type="alertmodal"> Go to the Official Linden Blog, for the latest news and information. <usetemplate - ignoretext="When launching web browser to view the blog" + ignoretext="Launch my browser to view the blog" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2775,9 +2964,9 @@ Go to the Official Linden Blog, for the latest news and information. icon="alertmodal.tga" name="WebLaunchLSLGuide" type="alertmodal"> -Go to the Scripting Guide for scripting help? +Do you want to open the Scripting Guide for help with scripting? <usetemplate - ignoretext="When launching web browser to view the Scripting Guide" + ignoretext="Launch my browser to view the Scripting Guide" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2787,9 +2976,9 @@ Go to the Scripting Guide for scripting help? icon="alertmodal.tga" name="WebLaunchLSLWiki" type="alertmodal"> -Go to the LSL Portal for scripting help? +Do you want to visit the LSL Portal for help with scripting? <usetemplate - ignoretext="When launching web browser to view the LSL Portal" + ignoretext="Launch my browser to view the LSL Portal" name="okcancelignore" notext="Cancel" yestext="Go to page"/> @@ -2803,7 +2992,7 @@ Are you sure you want to return the selected objects to their owners? Transferab *WARNING* No-transfer deeded objects will be deleted! <usetemplate - ignoretext="When returning objects to their owners" + ignoretext="Confirm before I return objects to their owners" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -2825,18 +3014,18 @@ Leave Group? icon="alert.tga" name="ConfirmKick" type="alert"> -Do you REALLY want to kick all users off the grid? +Do you REALLY want to kick all Residents off the grid? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Kick All Users"/> + yestext="Kick All Residents"/> </notification> <notification icon="alertmodal.tga" name="MuteLinden" type="alertmodal"> -Sorry, you cannot mute a Linden. +Sorry, you cannot block a Linden. <usetemplate name="okbutton" yestext="OK"/> @@ -2851,10 +3040,10 @@ You cannot start an auction on a parcel which is already set for sale. Disable <notification icon="alertmodal.tga" - label="Mute object by name failed" + label="Block object by name failed" name="MuteByNameFailed" type="alertmodal"> -You already have muted this name. +You already have blocked this name. <usetemplate name="okbutton" yestext="OK"/> @@ -2895,10 +3084,10 @@ Cannot offer friendship at this time. Please try again in a moment. icon="alert.tga" name="BusyModeSet" type="alert"> -Busy mode set. +Busy mode is set. Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash. <usetemplate - ignoretext="When setting busy mode" + ignoretext="I change my status to Busy mode" name="okignore" yestext="OK"/> </notification> @@ -2907,10 +3096,8 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo icon="alert.tga" name="JoinedTooManyGroupsMember" type="alert"> -You are a member of too many groups to join another one. Please leave at least one group before joining this one, or decline the offer. -To leave a group select the 'Groups...' option from the 'Edit' menu. +You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. -[INVITE] <usetemplate name="okcancelbuttons" notext="Decline" @@ -2919,9 +3106,19 @@ To leave a group select the 'Groups...' option from the 'Edit&apo <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? +Kick this Resident with what message? <form name="form"> <input name="message" type="text"> An administrator has logged you off. @@ -2963,7 +3160,7 @@ An administrator has logged you off. icon="alert.tga" name="FreezeUser" type="alert"> -Freeze this user with what message? +Freeze this Resident with what message? <form name="form"> <input name="message" type="text"> You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM). @@ -2984,7 +3181,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you icon="alert.tga" name="UnFreezeUser" type="alert"> -Unfreeze this user with what message? +Unfreeze this Resident with what message? <form name="form"> <input name="message" type="text"> You are no longer frozen. @@ -3026,7 +3223,7 @@ Join me in [REGION] icon="alertmodal.tga" name="OfferTeleportFromGod" type="alertmodal"> -God summon user to your location? +God summon Resident to your location? <form name="form"> <input name="message" type="text"> Join me in [REGION] @@ -3047,9 +3244,45 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport? +Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? + <usetemplate + ignoretext="Confirm that I want to teleport to a landmark" + name="okcancelignore" + notext="Cancel" + yestext="Teleport"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportToPick" + type="alertmodal"> +Teleport to [PICK]? + <usetemplate + ignoretext="Confirm that I want to teleport to a location in Picks" + name="okcancelignore" + notext="Cancel" + yestext="Teleport"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportToClassified" + type="alertmodal"> + Teleport to [CLASSIFIED]? <usetemplate - ignoretext="When teleporting from a landmark in inventory" + ignoretext="Confirm that I want to teleport to a location in Classifieds" + name="okcancelignore" + notext="Cancel" + yestext="Teleport"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TeleportToHistoryEntry" + type="alertmodal"> +Teleport to [HISTORY_ENTRY]? + <usetemplate + ignoretext="Confirm that I want to teleport to a history location" name="okcancelignore" notext="Cancel" yestext="Teleport"/> @@ -3082,7 +3315,7 @@ Type a short announcement which will be sent to everyone currently in your estat type="alert"> You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). -This 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. +This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup. Proceed? <usetemplate @@ -3253,13 +3486,13 @@ You are not allowed in that region due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="When Region entry is blocked due to maturity Rating"/> + ignoretext="I can't enter this Region, due to restrictions of the maturity Rating"/> </notification> <notification @@ -3275,7 +3508,7 @@ You are not allowed in that region due to your maturity Rating. type="alertmodal"> You are not allowed in that Region due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me > Preferences > General. <form name="form"> <button index="0" @@ -3286,11 +3519,18 @@ You can click 'Change Preference' to raise your maturity Rating prefer index="1" name="Cancel" text="Close"/> - <ignore name="ignore" text="When Region entry is blocked due to maturity Rating preference"/> + <ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/> </form> </notification> <notification + icon="notifytip.tga" + name="PreferredMaturityChanged" + type="notifytip"> +Your maturity Rating preference is now [RATING]. + </notification> + + <notification icon="alertmodal.tga" name="LandClaimAccessBlocked" type="alertmodal"> @@ -3310,13 +3550,13 @@ You cannot claim this land due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="When claiming land is blocked due to maturity Rating"/> + ignoretext="I can't claim this Land, due to restrictions of the maturity Rating"/> </notification> <notification @@ -3332,12 +3572,12 @@ You cannot claim this land due to your maturity Rating. type="alertmodal"> You cannot claim this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" notext="Close" - ignoretext="When claiming land is blocked due to maturity Rating preference"/> + ignoretext="My chosen Rating preference prevents me from claiming Land"/> </notification> <notification @@ -3360,13 +3600,13 @@ You cannot buy this land due to your maturity Rating. Go to the Knowledge Base for more information about maturity Ratings? <url option="0" name="url"> - https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=6010 + http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview </url> <usetemplate name="okcancelignore" yestext="Go to Knowledge Base" notext="Close" - ignoretext="When a Land purchase is blocked due to maturity Rating"/> + ignoretext="I can't buy this Land, due to restrictions of the maturity Rating"/> </notification> <notification @@ -3382,19 +3622,19 @@ You cannot buy this land due to your maturity Rating. type="alertmodal"> You cannot buy this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" notext="Close" - ignoretext="When a Land purchase is blocked due to maturity Rating preference"/> + ignoretext="My chosen Rating preference prevents me from buying Land"/> </notification> <notification icon="alertmodal.tga" name="TooManyPrimsSelected" type="alertmodal"> - "There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again" +There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again <usetemplate name="okbutton" yestext="OK"/> @@ -3471,7 +3711,7 @@ Publish this classified now for L$[AMOUNT]? icon="alertmodal.tga" name="SetClassifiedMature" type="alertmodal"> -Does this classified contain Mature content? +Does this classified contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -3483,7 +3723,7 @@ Does this classified contain Mature content? icon="alertmodal.tga" name="SetGroupMature" type="alertmodal"> -Does this group contain Mature content? +Does this group contain Moderate content? <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -3525,384 +3765,13 @@ Type a short announcement which will be sent to everyone in this region. <notification icon="alertmodal.tga" - label="Block Terraform" - name="HelpRegionBlockTerraform" - type="alertmodal"> -If this box is checked, land owners will not be able to terraform their land regardless of the per-parcel 'Edit Terrain' setting. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Block Fly" - name="HelpRegionBlockFly" - type="alertmodal"> -If this box is checked, people will not be able to fly in this region regardless of the per-parcel 'Fly' setting. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Bulk Change Content Permissions" - name="HelpBulkPermission" - type="alertmodal"> -The Bulk Permissions tool helps you to quickly change the permissions on multiple items in the contents of the selected object(s). However, please note that you are only setting permissions on the items in the Contents of the selected objects -- not permissions on the container object(s) themselves. - -Also note, the permissions are not applied to the nested contents of any of the contained items. Your request only operates on items exactly one level deep. - -You can selectively choose which types of items to modify by using the checklist under 'Content Types' here. Snapshots are included when you select Textures. - -* This tool will only succeed at changing permissions on items you are allowed to change. -* You cannot grant any Next owner permissions which you do not already have. -* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none of its permissions will change. - -When you are ready to change the permissions in bulk, click 'Apply' and wait for the results to display. - -If you close the Bulk Permissions window while permissions are being changed, it will halt the operation. - </notification> - - <notification - icon="alertmodal.tga" - label="Allow Damage" - name="HelpRegionAllowDamage" - type="alertmodal"> -If this box is checked, the health system across all parcels regardless of individual parcel settings. If this box is left unchecked, individual parcel owners will still be able to activate the health system on their parcels. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Agent Limit" - name="HelpRegionAgentLimit" - type="alertmodal"> -Sets the maximum number of avatars allowed in this region. -Performance may vary depending on the number avatars present. - -Default: 40 - </notification> - - <notification - icon="alertmodal.tga" - label="Object Bonus" - name="HelpRegionObjectBonus" - type="alertmodal"> -The Object Bonus is a multiplier for primitives allowed on any given parcel. The range allowed is 1 to 10. Set at '1', each 512m² parcel is allowed 117 objects. Set at '2', each 512m² parcel is allowed 234, or twice as many, and so on. The max number of objects allowed per region remains 15,000 no matter what the Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. - -Default: 1.0 - </notification> - - <notification - icon="alertmodal.tga" - label="Maturity" - name="HelpRegionMaturity" - type="alertmodal"> -Sets the maturity Rating of the Region, as shown in the menu bar at the top of any Resident's viewer, and in tooltips on the World Map when the cursor hovers over this Region. This setting also affects access to this Region and search results. Other Residents may only enter Regions or view search results with the same maturity Ratings they have chosen in their preferences. - -It may take some time for this change to be reflected on the map. - </notification> - - <notification - icon="alertmodal.tga" - label="Restrict Pushing" - name="HelpRegionRestrictPushObject" - type="alertmodal"> -This checkbox sets the full region to restricted push permissions. -When enabled, Residents may only be pushed by themselves or by the parcel's owner. -(Push refers to the llPushObject() LSL function.) - -Default: Off - </notification> - - <notification - icon="alertmodal.tga" - label="Parcel Join/Subdivide" - name="HelpParcelChanges" - type="alertmodal"> -This checkbox sets whether or not parcels not owned by the estate owner can be joined or subdivided. -If this option is unchecked: - * Only estate owners or managers can join or subdivide parcels. - * They may only join or subdivide parcels belonging to the owner, or to a group where they have the appropriate group powers. -If this option is checked: - * All parcel owners can join or subdivide the parcels they own. - * For group owned parcels, those with appropriate group powers may join or subdivide parcels. - -Default: Checked - </notification> - - <notification - icon="alertmodal.tga" - label="Do Not Show In Search" - name="HelpRegionSearch" - type="alertmodal"> -Checking this box will block parcel owners from listing their parcels in search. - -Default: Off - </notification> - - <notification - icon="alertmodal.tga" label="Changed Region Maturity" name="RegionMaturityChange" type="alertmodal"> The maturity rating for this region has been updated. It may take some time for the change to be reflected on the map. - </notification> - - <notification - icon="alertmodal.tga" - label="Land Resale" - name="HelpRegionLandResell" - type="alertmodal"> -Estate owners and managers can sell any land owned by the estate owner. -If this option is left unchecked, buyers cannot resell their land in this region. -If this option is checked, buyers can resell their land in this region. - -Default: Disallow - </notification> - - <notification - icon="alertmodal.tga" - label="Disable Scripts" - name="HelpRegionDisableScripts" - type="alertmodal"> -When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. -If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance. - -Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted 'top script'. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object. -Uncheck the Disable Script box and then Apply to reactivate the scripts in the region. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Disable Collisions" - name="HelpRegionDisableCollisions" - type="alertmodal"> -When sim performance is poor, physical objects may be to blame. -Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS. If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button. -You will be given the name and location of physical objects that may be causing poor performance. -Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted 'top collider'. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object. -Uncheck the Disable Collisions box and then Apply to reactivate collisions in the region. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Disable Physics" - name="HelpRegionDisablePhysics" - type="alertmodal"> -Disable Physics is similar to Disable Collisions, except all physics simulation is disabled. This means that not only will objects stop colliding, but avatars will be unable to move. - -This should only be used when Disable Collisions does not give back enough performance to the region to investigate a physics problem or Top Collider. - -Be sure to re-enable physics when you are done, or avatars will continue to be unable to move. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Top Colliders" - name="HelpRegionTopColliders" - type="alertmodal"> -Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select View > Statistics Bar and look under Simulator > Time > Sim Time (Physics) to see if more than 20 ms is being spent in physics. - </notification> - - <notification - icon="alertmodal.tga" - label="Top Scripts" - name="HelpRegionTopScripts" - type="alertmodal"> -Show a list of objects spending the most time running LSL scripts. These objects can slow performance. -Select View > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts. - </notification> - - <notification - icon="alertmodal.tga" - label="Restart Region" - name="HelpRegionRestart" - type="alertmodal"> -Restart the server process running this region after a two minute warning. All Residents in the region will be disconnected. The region will save its data, and should come back up within 90 seconds. - -Restarting the region will not fix most performance problems, and should usually be used only when directed. - </notification> - - <notification - icon="alertmodal.tga" - label="Water Height" - name="HelpRegionWaterHeight" - type="alertmodal"> -This is the height in meters where water appears. If this setting is anything other than 20 and you have water that is adjacent to the edge of world or 'void' water, there will be a visible gap. - -Default: 20 - </notification> - - <notification - icon="alertmodal.tga" - label="Terrain Raise" - name="HelpRegionTerrainRaise" - type="alertmodal"> -This is the distance in meters that parcel owners can raise their terrain above the 'baked' terrain default height. - -Default: 4 - </notification> - - <notification - icon="alertmodal.tga" - label="Terrain Lower" - name="HelpRegionTerrainLower" - type="alertmodal"> -This is the distance in meters that parcel owners can lower their terrain below the 'baked' terrain default height. - -Default: -4 - </notification> - - <notification - icon="alertmodal.tga" - label="Upload RAW Terrain" - name="HelpRegionUploadRaw" - type="alertmodal"> -This button uploads a .RAW file to the region you are in. -The file must have the correct dimensions (RGB, 256x256) and 13 channels. The best way to create a terrain file is to download the existing RAW file. A good first step is to modify the red channel (land height), and upload it. - -The upload can take up to 45 seconds. Note that uploading a terrain file *will not* move the objects that are on the land, only the terrain itself and the permissions associated with the parcels. This can result in objects going underground. - -For more information on editing region height fields, consult F1 Help. - </notification> - - <notification - icon="alertmodal.tga" - label="Download RAW Terrain" - name="HelpRegionDownloadRaw" - type="alertmodal"> -This button downloads a file containing the height field data, parcel dimensions, parcel for sale status and some parcel permissions for this region. When opening the file in a program such as Photoshop you must specify the document's dimensions which are: RGB, 256x256 with 13 channels. This terrain file cannot be opened in any other way. - -For more information on editing region height fields, consult F1 help. - </notification> - - <notification - icon="alertmodal.tga" - label="Use Estate Sun" - name="HelpRegionUseEstateSun" - type="alertmodal"> -This checkbox makes the sun position in this region the same as the sun position in the rest of the estate. - -Default: on - </notification> - - <notification - icon="alertmodal.tga" - label="Fixed Sun" - name="HelpRegionFixedSun" - type="alertmodal"> -This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Bake Terrain" - name="HelpRegionBakeTerrain" - type="alertmodal"> -This button saves the current shape of the terrain as the new default for the region. Once baked, the land can revert to the saved shape whenever you or others use the Edit Terrain 'Revert' option. The baked terrain is also the middle point for the terrain raise and lower limits. - </notification> - - <notification - icon="alertmodal.tga" - label="Estate Managers" - name="HelpEstateEstateManager" - type="alertmodal"> -An estate manager is a Resident to whom you have delegated control of region and estate settings. An estate manager can change any setting in these panels, except for uploading, downloading, and baking terrain. In particular, they can allow or ban Residents from your estate. - -Estate managers can only be added or removed by the owner of the estate, not by each other. Please only choose Residents you trust as estate managers, as you will be ultimately responsible for their actions. - </notification> - - <notification - icon="alertmodal.tga" - label="Use Global Time" - name="HelpEstateUseGlobalTime" - type="alertmodal"> -This checkbox makes the sun in your estate follow the same position as on the Linden-owned 'mainland' estates. - -Default: on - </notification> - - <notification - icon="alertmodal.tga" - label="Fixed Sun" - name="HelpEstateFixedSun" - type="alertmodal"> -This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving. - </notification> - - <notification - icon="alertmodal.tga" - label="Public Access" - name="HelpEstateExternallyVisible" - type="alertmodal"> -This checkbox sets whether Residents who are on other estates can enter this estate without being on an access list. - -Default: on - </notification> - - <notification - icon="alertmodal.tga" - label="Allow Direct Teleport" - name="HelpEstateAllowDirectTeleport" - type="alertmodal"> -When checked, allows Residents to directly teleport to any point in your estate. When unchecked, Residents teleport to the nearest telehub. - -Default: off - </notification> - - <notification - icon="alertmodal.tga" - label="Allow Access" - name="HelpEstateAllowResident" - type="alertmodal"> -Access to this estate will be limited to Residents listed here and any groups below. This setting is only available when Public Access is unchecked. - </notification> - - <notification - icon="alertmodal.tga" - label="Allow Group Access" - name="HelpEstateAllowGroup" - type="alertmodal"> -Access to this estate will be limited to groups listed here and any Residents above. This setting is only available when Public Access is unchecked. - </notification> - - <notification - icon="alertmodal.tga" - label="Abuse Email Address" - name="HelpEstateAbuseEmailAddress" - type="alertmodal"> -Setting this to a valid email address will cause abuse reports on this estate to be sent to that address. -Setting it blank will cause abuse reports to be sent only to Linden Lab. - </notification> - - <notification - icon="alertmodal.tga" - label="Deny Access" - name="HelpEstateBanResident" - type="alertmodal"> -Residents on this list are denied access to your estate, regardless of any other settings. - </notification> - - <notification - icon="alertmodal.tga" - label="Allow Voice Chat" - name="HelpEstateVoiceChat" - type="alertmodal"> -Parcels in this estate are allowed to have their own voice channels in which residents may hear and talk with others nearby. - -Default: off +To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification. </notification> <notification @@ -3910,19 +3779,7 @@ Default: off label="Voice Version Mismatch" name="VoiceVersionMismatch" type="alertmodal"> -This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life. - </notification> - - <notification - icon="alertmodal.tga" - label="Estate Covenant" - name="HelpEstateCovenant" - type="alertmodal"> -Setting an estate covenant enables you to sell parcels within that estate. If a covenant is not set, you cannot sell the land. The notecard for your covenant can be empty if you do not wish to apply any rules or advise buyers of anything in relation to the land before they buy it. - -A covenant can be used to communicate rules, guidelines, cultural information or simply your own expectations to the prospective buyer. This can include zoning, building regulations, payment options or any other information you feel it is important for the new owner to have seen and to have agreed to before they purchase. - -The buyer must agree to the covenant by ticking the check box before they will be able to finish the purchase. Estate covenants are always visible in the About Land dialog for any parcels that have one set. +This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME]. </notification> <notification @@ -4099,7 +3956,7 @@ These items will be moved to your inventory, not copied. Move the inventory item(s)? <usetemplate - ignoretext="When moving no-copy inventory from objects" + ignoretext="Warn me before I move 'no-copy' items from an object" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -4114,7 +3971,7 @@ Because this object is scripted, moving these items to your inventory may cause Move the inventory item(s)? <usetemplate - ignoretext="When moving no-copy inventory from scripted objects" + ignoretext="Warn me before I move 'no-copy' items which might break a scripted object" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -4124,10 +3981,10 @@ Move the inventory item(s)? icon="alert.tga" name="ClickActionNotPayable" type="alert"> -Warning: The Pay Object click action has been set, but it will only work if a script is added with a money() event. +Warning: The 'Pay object' click action has been set, but it will only work if a script is added with a money() event. <form name="form"> <ignore name="ignore" - text="When Setting 'Pay' on objects without money() events"/> + text="I set the action 'Pay object' when building an object without a money() script"/> </form> </notification> @@ -4142,9 +3999,9 @@ There are no items in this object that you are allowed to copy. icon="alertmodal.tga" name="WebLaunchAccountHistory" type="alertmodal"> -Go to the Second Life web site to see your account history? +Go to your [http://secondlife.com/account/ Dashboard] to see your account history? <usetemplate - ignoretext="When loading account history web page" + ignoretext="Launch my browser to see my account history" name="okcancelignore" notext="Cancel" yestext="Go to page"/> @@ -4152,70 +4009,38 @@ Go to the Second Life web site to see your account history? <notification icon="alertmodal.tga" - name="ClickOpenF1Help" - type="alertmodal"> -Visit the Second Life Support Web site? - <usetemplate - ignoretext="When visiting the Second Life Support Website." - name="okcancelignore" - notext="Cancel" - yestext="Go"/> - </notification> - - <notification - icon="alertmodal.tga" name="ConfirmQuit" - type="alertmodal"> + type="alertmodal" + unique="true"> Are you sure you want to quit? <usetemplate - ignoretext="When Quitting Second Life." + ignoretext="Confirm before I quit" name="okcancelignore" - notext="Continue" + notext="Don't Quit" yestext="Quit"/> </notification> <notification icon="alertmodal.tga" - name="HelpReportAbuseEmailLL" - type="alertmodal"> -Use this tool to report violations of the Terms of Service and Community Standards. See: - -http://secondlife.com/corporate/tos.php -http://secondlife.com/corporate/cs.php - -All reported abuses of the Terms of Service and Community Standards are investigated and resolved. You can view the incident resolution on the Incident Report at: - -http://secondlife.com/support/incidentreport.php - </notification> - - <notification - icon="alertmodal.tga" - name="HelpReportAbuseEmailEO" - type="alertmodal"> -IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab. - -As 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. - -The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant. -(View covenants by going to the World menu and selecting About Land.) - -The resolution of this report applies only to this Region; Residents access to other areas of Second Life will not be affected by the outcome of this report. Only Linden Lab can restrict access to the entirety of Second Life. + name="DeleteItems" + type="alertmodal" + unique="true"> + [QUESTION] + <usetemplate + ignoretext="Confirm before deleting items" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> </notification> <notification icon="alertmodal.tga" - name="HelpReportBug" - type="alertmodal"> -Use this tool to *only* report technical features that do not perform as described or expected, please provide as much detail as possible. -You may reply to the auto-response email to add more details to your report. - -All bug reports are investigated and assessed. No email response will be sent. - -If you are having a technical difficulty, please contact Support at: - -http://secondlife.com/community/support.php + name="HelpReportAbuseEmailLL" + type="alert" + unique="true"> +Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. -Note: Incomplete reports will not be investigated +All reported abuses are investigated and resolved. </notification> <notification @@ -4228,14 +4053,6 @@ Selecting a category helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugSelectCategory" - type="alertmodal"> -Please select a category for this bug. -Selecting a category helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseAbuserNameEmpty" type="alertmodal"> Please enter the name of the abuser. @@ -4260,14 +4077,6 @@ Entering an accurate summary helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugSummaryEmpty" - type="alertmodal"> -Please enter a summary of the bug. -Entering an accurate summary helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseDetailsEmpty" type="alertmodal"> Please enter a detailed description of the abuse that took place. @@ -4277,24 +4086,15 @@ Entering an accurate description helps us file and process abuse reports. <notification icon="alertmodal.tga" - name="HelpReportBugDetailsEmpty" - type="alertmodal"> -Please enter a detailed description of the bug. -Be as specific as you can, including steps to reproduce the bug if possible. -Entering an accurate description helps us file and process bug reports. - </notification> - - <notification - icon="alertmodal.tga" name="HelpReportAbuseContainsCopyright" type="alertmodal"> Dear Resident, You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly: -(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. +(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] [http://secondlife.com/corporate/tos.php Terms of Service] or [http://secondlife.com/corporate/cs.php Community Standards]. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world. -(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. +(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 [http://secondlife.com/corporate/dmca.php DMCA Policy]. If 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 'CopyBot or Permissions Exploit'. @@ -4321,7 +4121,7 @@ Do you want to replace it with the selected object? <form name="form"> <ignore name="ignore" save_option="true" - text="When replacing existing attachments"/> + text="Replace an existing attachment with the selected item"/> <button default="true" ignore="Replace Automatically" @@ -4347,7 +4147,7 @@ Would you like to leave Busy Mode before completing this transaction? <form name="form"> <ignore name="ignore" save_option="true" - text="When paying a person or object in busy mode"/> + text="I am about to pay a person or object while I am in Busy mode"/> <button default="true" ignore="Always leave Busy Mode" @@ -4364,11 +4164,23 @@ Would you like to leave Busy Mode before completing this transaction? <notification icon="alertmodal.tga" + name="ConfirmDeleteProtectedCategory" + type="alertmodal"> +The folder '[FOLDERNAME]' is a system folder. Deleting system folders can cause instability. Are you sure you want to delete it? + <usetemplate + ignoretext="Confirm before I delete a system folder" + name="okcancelignore" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Trash folder? +Are you sure you want to permanently delete the contents of your Trash? <usetemplate - ignoretext="When emptying your inventory trash folder" + ignoretext="Confirm before I empty the inventory Trash folder" name="okcancelignore" notext="Cancel" yestext="OK"/> @@ -4378,11 +4190,11 @@ Are you sure you want to permanently remove the contents of your Trash folder? icon="alertmodal.tga" name="ConfirmClearBrowserCache" type="alertmodal"> -Are you sure you want to clear your browser cache? +Are you sure you want to delete your travel, web, and search history? <usetemplate name="okcancelbuttons" notext="Cancel" - yestext="Yes"/> + yestext="OK"/> </notification> <notification @@ -4411,9 +4223,9 @@ Are you sure you want to clear your list of saved URLs? icon="alertmodal.tga" name="ConfirmEmptyLostAndFound" type="alertmodal"> -Are you sure you want to permanently remove the contents of your Lost And Found folder? +Are you sure you want to permanently delete the contents of your Lost And Found? <usetemplate - ignoretext="When emptying your inventory Lost And Found folder" + ignoretext="Confirm before I empty the inventory Lost And Found folder" name="okcancelignore" notext="No" yestext="Yes"/> @@ -4423,43 +4235,18 @@ Are you sure you want to permanently remove the contents of your Lost And Found icon="alertmodal.tga" name="CopySLURL" type="alertmodal"> -The following SLURL has been copied to your clipboard: +The following SLurl has been copied to your clipboard: [SLURL] -Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser. +Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser. <form name="form"> <ignore name="ignore" - text="When copying a SLURL to your clipboard"/> + text="SLurl is copied to my clipboard"/> </form> </notification> <notification icon="alertmodal.tga" - name="GraphicsPreferencesHelp" - type="alertmodal"> -This panel controls window size and resolution and the quality of the client's graphics. The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings: - -Shaders: Enable or disable various types of pixel shaders. - -Reflection Detail: Sets the types of objects that water can reflect. - -Avatar Rendering: Sets options that affect how the client renders avatars. - -Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene. - -Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once. - -Post Process Quality: Sets the resolution with which Glow is rendered. - -Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail. - -Lighting Detail: Selects what types of lights you would like to render. - -Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. - </notification> - - <notification - icon="alertmodal.tga" name="WLSavePresetAlert" type="alertmodal"> Do you wish to overwrite the saved preset? @@ -4506,306 +4293,6 @@ PostProcess Effect exists. Do you still wish overwrite it? </notification> <notification - icon="alertmodal.tga" - name="HelpEditSky" - type="alertmodal"> -Edit the WindLight sliders to create and save a set of skies. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpEditDayCycle" - type="alertmodal"> -Set which skies to turn to throughout the day. - </notification> - - <notification - icon="alertmodal.tga" - name="EnvSettingsHelpButton" - type="alertmodal"> -These settings adjust the way the environment looks locally on your computer. Your graphics card needs to support atmospheric shaders in order to have access to all of the settings. - -Adjust the "Time of Day" slider to change the day's phase locally on the viewer. - -Adjust the "Cloud Cover" slider to control how much the clouds cover the sky. - -Pick a color in the "Water Color" color picker to change the color of the water. - -Adjust the "Water Fog" slider to control how dense the fog is underwater. - -Click "Use Estate Time" to reset the time of day to the region's current time of day and remain linked to it. - -Click "Advanced Sky" to bring up an editor with more advanced settings for the sky. - -Click "Advanced Water" to bring up an editor with more advanced settings for the water. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpDayCycle" - type="alertmodal"> -The Day Cycle Editor gives you control over the sky during Second Life's day/night cycle. This is the cycle that is used by the Basic Environment Editor's Time of Day slider. - -The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky "animates" as it interpolates between these keyframes. - -The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline. - -You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you'll be able to associate the keyframe with its respective WindLight preset. - -Length of Cycle dictates the overall duration of a "day". Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate's day cycle. - -Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpBlueHorizon" - type="alertmodal"> -Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpHazeHorizon" - type="alertmodal"> -Haze Horizon is one of the most useful parameters for adjusting overall light exposure in the scene. It is effective for simulating many exposure settings, such as white-outs from the sun and darker, closed-iris settings. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpBlueDensity" - type="alertmodal"> -Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky's color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpHazeDensity" - type="alertmodal"> -Haze Density controls the level of dull, gray haze in the atmosphere. It is effective for simulating scenes with high levels of smoke and man-made pollutants. It is also effective for simulating fog and mist. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpDensityMult" - type="alertmodal"> -The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of "thin air", and at higher settings, it creates a very heavy, smoggy effect. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpDistanceMult" - type="alertmodal"> -Adjusts WindLight's perceived distance. A value of zero effectively turns off WindLight's influence on terrain and objects. Values greater than 1 simulate greater distances for thicker atmospheric effects. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpMaxAltitude" - type="alertmodal"> -Max Altitude adjusts the altitude calculations WindLight performs when computing its atmospheric lighting. At later times of day, it is useful for adjusting how "deep" the sunset appears. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpSunlightColor" - type="alertmodal"> -Adjusts the color and intensity of the direct light in the scene. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpSunAmbient" - type="alertmodal"> -Adjusts the color and intensity of ambient atmospheric light in the scene. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpSunGlow" - type="alertmodal"> -The Size slider controls the size of the sun. -The Focus slider controls how blurred the sun is over the sky. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpSceneGamma" - type="alertmodal"> -Adjust the screen's distribution of light and dark. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpStarBrightness" - type="alertmodal"> -Adjusts the brightness of the stars in the sky. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpTimeOfDay" - type="alertmodal"> -Controls the location of the sun in the sky. -Similar to elevation. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpEastAngle" - type="alertmodal"> -Controls the location of the sun in the sky. -Similar to azimuth. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudColor" - type="alertmodal"> -Edits the color of the clouds. It is generally recommended to keep it whitish, but hey, have fun if you want. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudDetail" - type="alertmodal"> -Controls the detail image layered on top of the main cloud image. X and Y control its position. D (Density) controls how puffy or fractured the clouds appear. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudDensity" - type="alertmodal"> -Allows you to control the position of the clouds with the X and Y sliders and how dense they are with the the D slider. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudCoverage" - type="alertmodal"> -Controls how much the clouds cover the sky. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudScale" - type="alertmodal"> -Controls the scaling of the cloud image on the sky dome. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudScrollX" - type="alertmodal"> -Controls the speed of the clouds as they move in the X direction. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpCloudScrollY" - type="alertmodal"> -Controls the speed of the clouds as they move in the Y direction. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpClassicClouds" - type="alertmodal"> -Check this box to enable rendering of Second Life's older classic clouds in addition to WindLight's clouds. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterFogColor" - type="alertmodal"> -Chooses the color of the underwater fog. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterFogDensity" - type="alertmodal"> -Controls how dense the water fog is and how far you can see underwater. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpUnderWaterFogMod" - type="alertmodal"> -Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterGlow" - type="alertmodal"> -Controls how much the surface of the water glows. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterNormalScale" - type="alertmodal"> -Controls the scaling of the three wavelets that make up the water. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterFresnelScale" - type="alertmodal"> -Controls how much light is reflected at different angles. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterFresnelOffset" - type="alertmodal"> -Controls how much light intensity is reflected. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterScaleAbove" - type="alertmodal"> -Controls how much light is refracted from looking above the surface of the water. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterScaleBelow" - type="alertmodal"> -Controls how much light is refracted from looking from below the surface of the water. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterBlurMultiplier" - type="alertmodal"> -Controls how waves and reflections are mixed. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterNormalMap" - type="alertmodal"> -Controls what normal map is layered across the water to determine reflections/refractions. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterWave1" - type="alertmodal"> -Controls where and how fast the large scaled version of the normal map moves in the X and Y direction. - </notification> - - <notification - icon="alertmodal.tga" - name="HelpWaterWave2" - type="alertmodal"> -Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction. - </notification> - - <notification icon="alert.tga" name="NewSkyPreset" type="alert"> @@ -4905,7 +4392,7 @@ Your chat session with [NAME] must close. icon="alertmodal.tga" name="Cannot_Purchase_an_Attachment" type="alertmodal"> -Items may not be purchased while they are part of an attachment. +You can't buy an object while it is attached. </notification> <notification @@ -4923,9 +4410,9 @@ Granting this request gives a script ongoing permission to take Linden dollars ( icon="alertmodal.tga" name="AutoWearNewClothing" type="alertmodal"> -Would you like to automatically wear the clothing item you create? +Would you like to automatically wear the clothing you are about to create? <usetemplate - ignoretext="Automatically wear new clothing" + ignoretext="Wear the clothing I create while editing My Appearance" name="okcancelignore" notext="No" yestext="Yes"/> @@ -4935,16 +4422,15 @@ Would you like to automatically wear the clothing item you create? icon="alertmodal.tga" name="NotAgeVerified" type="alertmodal"> -You need to be age-verified in order to access this parcel. -Would you like to visit the Second Life website to verify your age? +You must be age-verified to visit this area. Do you want to go to the [SECOND_LIFE] website and verify your age? [_URL] <url option="0" name="url"> - https://secondlife.com/account/verification.php + https://secondlife.com/account/verification.php </url> <usetemplate - ignoretext="Warn about lack of age verification" + ignoretext="I have not verified my age" name="okcancelignore" notext="No" yestext="Yes"/> @@ -4954,8 +4440,7 @@ Would you like to visit the Second Life website to verify your age? icon="alertmodal.tga" name="Cannot enter parcel: no payment info on file" type="alertmodal"> -This parcel requires that you have payment information on file before you can access it. -Would you like to visit the Second Life website to set this up? +You must have payment information on file to visit this area. Do you want to go to the [SECOND_LIFE] website and set this up? [_URL] <url option="0" name="url"> @@ -4963,7 +4448,7 @@ Would you like to visit the Second Life website to set this up? https://secondlife.com/account/ </url> <usetemplate - ignoretext="Warn about lack of payment info" + ignoretext="I lack payment information on file" name="okcancelignore" notext="No" yestext="Yes"/> @@ -4982,6 +4467,13 @@ The string [STRING_NAME] is missing from strings.xml type="notifytip"> [MESSAGE] </notification> + + <notification + icon="notifytip.tga" + name="IMSystemMessageTip" + type="notifytip"> +[MESSAGE] + </notification> <notification icon="notifytip.tga" @@ -5014,6 +4506,7 @@ Replaced missing clothing/body part with default. <notification icon="groupnotify" name="GroupNotice" + persist="true" type="groupnotify"> Topic: [SUBJECT], Message: [MESSAGE] </notification> @@ -5036,7 +4529,7 @@ Topic: [SUBJECT], Message: [MESSAGE] icon="notifytip.tga" name="AddSelfFriend" type="notifytip"> -You cannot add yourself as a friend. +Although you're very nice, you can't add yourself as a friend. </notification> <notification @@ -5050,6 +4543,7 @@ Uploading in-world and web site snapshots... <notification icon="notify.tga" name="UploadPayment" + persist="true" type="notify"> You paid L$[AMOUNT] to upload. </notification> @@ -5079,7 +4573,7 @@ Terrain.raw downloaded icon="notifytip.tga" name="GestureMissing" type="notifytip"> -Gesture [NAME] is missing from database. +Hmm. Gesture [NAME] is missing from the database. </notification> <notification @@ -5087,7 +4581,6 @@ Gesture [NAME] is missing from database. name="UnableToLoadGesture" type="notifytip"> Unable to load gesture [NAME]. -Please try again. </notification> <notification @@ -5109,7 +4602,7 @@ Unable to load landmark. Please try again. name="CapsKeyOn" type="notifytip"> Your Caps Lock key is on. -As this will affect the password you type in, you will probably want to turn it off. +This might affect your password. </notification> <notification @@ -5123,7 +4616,7 @@ Notecard is missing from database. icon="notifytip.tga" name="NotecardNoPermissions" type="notifytip"> -Insufficient permissions to view notecard. +You don't have permission to view this notecard. </notification> <notification @@ -5210,7 +4703,7 @@ Please try again. icon="notifytip.tga" name="CannotBuyObjectsFromDifferentOwners" type="notifytip"> -Cannot buy objects from different owners at the same time. +You can only buy objects from one owner at a time. Please select a single object. </notification> @@ -5218,7 +4711,7 @@ Please select a single object. icon="notifytip.tga" name="ObjectNotForSale" type="notifytip"> -Object does not appear to be for sale. +This object is not for sale. </notification> <notification @@ -5232,21 +4725,21 @@ Entering god mode, level [LEVEL] icon="notifytip.tga" name="LeavingGodMode" type="notifytip"> -Leaving god mode, level [LEVEL] +Now leaving god mode, level [LEVEL] </notification> <notification icon="notifytip.tga" name="CopyFailed" type="notifytip"> -Copy failed because you lack copy permission +You don't have permission to copy this. </notification> <notification icon="notifytip.tga" name="InventoryAccepted" type="notifytip"> -[NAME] accepted your inventory offer. +[NAME] received your inventory offer. </notification> <notification @@ -5281,16 +4774,18 @@ Your calling card was declined. icon="notifytip.tga" name="TeleportToLandmark" type="notifytip"> -Now that you have reached the mainland, you can teleport to locations like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder. -Double click on the landmark and click on Teleport to travel there. +You can teleport to locations like '[NAME]' by opening the Places panel on the right side of your screen, and then select the Landmarks tab. +Click on any landmark to select it, then click 'Teleport' at the bottom of the panel. +(You can also double-click on the landmark, or right-click it and choose 'Teleport'.) </notification> <notification icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> -Now that you have reached the mainland, you can contact residents like '[NAME]' by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder. -Double click on the card, click on Instant Message, and type a message. +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> <notification @@ -5312,7 +4807,7 @@ Some terms in your search query were excluded due to content restrictions as cla icon="notifytip.tga" name="NoContentToSearch" type="notifytip"> -Please select at least one type of content to search (PG, Mature, or Adult). +Please select at least one type of content to search (General, Moderate, or Adult). </notification> <notification @@ -5336,10 +4831,21 @@ Please select at least one type of content to search (PG, Mature, or Adult). <notification icon="notify.tga" name="SystemMessage" + persist="true" + type="notify"> +[MESSAGE] + </notification> + + <notification + icon="notify.tga" + name="PaymentRecived" + persist="true" type="notify"> [MESSAGE] </notification> + <!-- EventNotification couldn't be persist since server decide is it necessary to notify + user about subscribed event via LLEventNotifier--> <notification icon="notify.tga" name="EventNotification" @@ -5367,6 +4873,7 @@ Event Notification: <notification icon="notify.tga" name="TransferObjectsHighlighted" + persist="true" type="notify"> All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. @@ -5382,6 +4889,7 @@ All objects on this parcel that will transfer to the purchaser of this parcel ar <notification icon="notify.tga" name="DeactivatedGesturesTrigger" + persist="true" type="notify"> Deactivated gestures with same trigger: [NAMES] @@ -5390,14 +4898,39 @@ Deactivated gestures with same trigger: <notification icon="notify.tga" name="NoQuickTime" + persist="true" type="notify"> Apple's QuickTime software does not appear to be installed on your system. -If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player. +If you want to view streaming media on parcels that support it you should go to the [http://www.apple.com/quicktime QuickTime site] and install the QuickTime Player. </notification> + <notification + icon="notify.tga" + name="NoPlugin" + persist="true" + type="notify"> +No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. + <unique> + <context key="[MIME_TYPE]"/> + </unique> + + </notification> + <notification + icon="alertmodal.tga" + name="MediaPluginFailed" + type="alertmodal"> +The following Media Plugin has failed: + [PLUGIN] +Please re-install the plugin or contact the vendor if you continue to experience problems. + <form name="form"> + <ignore name="ignore" + text="A Media Plugin fails to run"/> + </form> + </notification> <notification icon="notify.tga" name="OwnedObjectsReturned" + persist="true" type="notify"> The objects you own on the selected parcel of land have been returned back to your inventory. </notification> @@ -5405,6 +4938,7 @@ The objects you own on the selected parcel of land have been returned back to yo <notification icon="notify.tga" name="OtherObjectsReturned" + persist="true" type="notify"> The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. </notification> @@ -5412,13 +4946,15 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have <notification icon="notify.tga" name="OtherObjectsReturned2" + persist="true" 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 icon="notify.tga" name="GroupObjectsReturned" + persist="true" type="notify"> The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. Transferable deeded objects have been returned to their previous owners. @@ -5428,57 +4964,71 @@ Non-transferable objects that are deeded to the group have been deleted. <notification icon="notify.tga" name="UnOwnedObjectsReturned" + persist="true" type="notify"> The objects on the selected parcel that are NOT owned by you have been returned to their owners. </notification> <notification icon="notify.tga" - name="NotSafe" + name="ServerObjectMessage" + persist="true" type="notify"> -This land has damage enabled ('not safe'). +Message from [NAME]: +<nolink>[MSG]</nolink> + </notification> + + <notification + icon="notify.tga" + name="NotSafe" + persist="true" + type="notify" + unique="true"> +This land has damage enabled. You can be hurt here. If you die, you will be teleported to your home location. - <unique/> </notification> <notification icon="notify.tga" name="NoFly" - type="notify"> -This land has flying disabled ('no fly'). -You cannot fly here. - <unique/> + persist="true" + type="notify" + unique="true"> +This area has flying disabled. +You can't fly here. </notification> <notification icon="notify.tga" name="PushRestricted" - type="notify"> -This land is 'No Pushing'. -You cannot push others here unless you own the land. - <unique/> + persist="true" + type="notify" + unique="true"> +This area does not allow pushing. You can't push others here unless you own the land. </notification> <notification icon="notify.tga" name="NoVoice" - type="notify"> -This land has voice disabled. - <unique/> + persist="true" + type="notify" + unique="true"> +This area has voice chat disabled. You won't be able to hear anyone talking. </notification> <notification icon="notify.tga" name="NoBuild" - type="notify"> -This land has building disabled ('no build'). -You cannot create objects here. - <unique/> + persist="true" + type="notify" + unique="true"> +This area has building disabled. You can't build or rez objects here. </notification> <notification icon="notify.tga" name="ScriptsStopped" + persist="true" type="notify"> An administrator has temporarily stopped scripts in this region. </notification> @@ -5486,6 +5036,7 @@ An administrator has temporarily stopped scripts in this region. <notification icon="notify.tga" name="ScriptsNotRunning" + persist="true" type="notify"> This region is not running any scripts. </notification> @@ -5493,30 +5044,35 @@ This region is not running any scripts. <notification icon="notify.tga" name="NoOutsideScripts" + persist="true" type="notify"> -This land has outside scripts disabled ('no outside scripts'). -No scripts will run except those belonging to the land owner. +This land has outside scripts disabled. + +No scripts will work here except those belonging to the land owner. </notification> <notification icon="notify.tga" name="ClaimPublicLand" + persist="true" type="notify"> -Can only claim public land in region you're in. +You can only claim public land in the Region you're in. </notification> <notification icon="notify.tga" name="RegionTPAccessBlocked" + persist="true" type="notify"> You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. -Please go to the Knowledge Base for details on accessing areas with this maturity Rating. +Please go to the Knowledge Base for details on accessing areas with this maturity Rating. </notification> <notification icon="notify.tga" name="URBannedFromRegion" + persist="true" type="notify"> You are banned from the region. </notification> @@ -5524,21 +5080,15 @@ You are banned from the region. <notification icon="notify.tga" name="NoTeenGridAccess" + persist="true" type="notify"> Your account cannot connect to this teen grid region. </notification> <notification icon="notify.tga" - name="NoHelpIslandTP" - type="notify"> -You cannot teleport back to Help Island. -Go to 'Help Island Public' to repeat the tutorial. - </notification> - - <notification - icon="notify.tga" name="ImproperPaymentStatus" + persist="true" type="notify"> You do not have proper payment status to enter this region. </notification> @@ -5546,6 +5096,7 @@ You do not have proper payment status to enter this region. <notification icon="notify.tga" name="MustGetAgeRgion" + persist="true" type="notify"> You must be age-verified to enter this region. </notification> @@ -5553,6 +5104,7 @@ You must be age-verified to enter this region. <notification icon="notify.tga" name="MustGetAgeParcel" + persist="true" type="notify"> You must be age-verified to enter this parcel. </notification> @@ -5560,6 +5112,7 @@ You must be age-verified to enter this parcel. <notification icon="notify.tga" name="NoDestRegion" + persist="true" type="notify"> No destination region found. </notification> @@ -5567,6 +5120,7 @@ No destination region found. <notification icon="notify.tga" name="NotAllowedInDest" + persist="true" type="notify"> You are not allowed into the destination. </notification> @@ -5574,6 +5128,7 @@ You are not allowed into the destination. <notification icon="notify.tga" name="RegionParcelBan" + persist="true" type="notify"> Cannot region cross into banned parcel. Try another way. </notification> @@ -5581,6 +5136,7 @@ Cannot region cross into banned parcel. Try another way. <notification icon="notify.tga" name="TelehubRedirect" + persist="true" type="notify"> You have been redirected to a telehub. </notification> @@ -5588,6 +5144,7 @@ You have been redirected to a telehub. <notification icon="notify.tga" name="CouldntTPCloser" + persist="true" type="notify"> Could not teleport closer to destination. </notification> @@ -5595,13 +5152,15 @@ Could not teleport closer to destination. <notification icon="notify.tga" name="TPCancelled" + persist="true" type="notify"> - Teleport cancelled. +Teleport cancelled. </notification> <notification icon="notify.tga" name="FullRegionTryAgain" + persist="true" type="notify"> The region you are attempting to enter is currently full. Please try again in a few moments. @@ -5610,6 +5169,7 @@ Please try again in a few moments. <notification icon="notify.tga" name="GeneralFailure" + persist="true" type="notify"> General failure. </notification> @@ -5617,6 +5177,7 @@ General failure. <notification icon="notify.tga" name="RoutedWrongRegion" + persist="true" type="notify"> Routed to wrong region. Please try again. </notification> @@ -5624,6 +5185,7 @@ Routed to wrong region. Please try again. <notification icon="notify.tga" name="NoValidAgentID" + persist="true" type="notify"> No valid agent id. </notification> @@ -5631,6 +5193,7 @@ No valid agent id. <notification icon="notify.tga" name="NoValidSession" + persist="true" type="notify"> No valid session id. </notification> @@ -5638,6 +5201,7 @@ No valid session id. <notification icon="notify.tga" name="NoValidCircuit" + persist="true" type="notify"> No valid circuit code. </notification> @@ -5645,6 +5209,7 @@ No valid circuit code. <notification icon="notify.tga" name="NoValidTimestamp" + persist="true" type="notify"> No valid timestamp. </notification> @@ -5652,6 +5217,7 @@ No valid timestamp. <notification icon="notify.tga" name="NoPendingConnection" + persist="true" type="notify"> Unable to create pending connection. </notification> @@ -5659,6 +5225,7 @@ Unable to create pending connection. <notification icon="notify.tga" name="InternalUsherError" + persist="true" type="notify"> Internal error attempting to connect agent usher. </notification> @@ -5666,6 +5233,7 @@ Internal error attempting to connect agent usher. <notification icon="notify.tga" name="NoGoodTPDestination" + persist="true" type="notify"> Unable to find a good teleport destination in this region. </notification> @@ -5673,6 +5241,7 @@ Unable to find a good teleport destination in this region. <notification icon="notify.tga" name="InternalErrorRegionResolver" + persist="true" type="notify"> Internal error attempting to activate region resolver. </notification> @@ -5680,6 +5249,7 @@ Internal error attempting to activate region resolver. <notification icon="notify.tga" name="NoValidLanding" + persist="true" type="notify"> A valid landing point could not be found. </notification> @@ -5687,6 +5257,7 @@ A valid landing point could not be found. <notification icon="notify.tga" name="NoValidParcel" + persist="true" type="notify"> No valid parcel could be found. </notification> @@ -5694,8 +5265,9 @@ No valid parcel could be found. <notification icon="notify.tga" name="ObjectGiveItem" - type="notify"> -An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME]. + type="offer"> +An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button index="0" @@ -5708,41 +5280,21 @@ An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECT <button index="2" name="Mute" - text="Mute"/> - </form> - </notification> - - <notification - icon="notify.tga" - name="ObjectGiveItemUnknownUser" - type="notify"> -An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME]. - <form name="form"> - <button - index="0" - name="Keep" - text="Keep"/> - <button - index="1" - name="Discard" - text="Discard"/> - <button - index="2" - name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> <notification icon="notify.tga" name="UserGiveItem" - type="notify"> -[NAME] has given you a [OBJECTTYPE] named '[OBJECTNAME]'. + type="offer"> +[NAME_SLURL] has given you this [OBJECTTYPE]: +[ITEM_SLURL] <form name="form"> <button - index="0" - name="Keep" - text="Keep"/> + index="4" + name="Show" + text="Show"/> <button index="1" name="Discard" @@ -5750,21 +5302,24 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> <notification icon="notify.tga" name="GodMessage" + persist="true" type="notify"> [NAME] + [MESSAGE] </notification> <notification icon="notify.tga" name="JoinGroup" + persist="true" type="notify"> [MESSAGE] <form name="form"> @@ -5786,10 +5341,10 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <notification icon="notify.tga" name="TeleportOffered" - type="notify"> -[NAME] has offered to teleport you to his or her location: + type="offer"> +[NAME_SLURL] has offered to teleport you to their location: -[MESSAGE] +[MESSAGE] - [MATURITY_STR] <icon>[MATURITY_ICON]</icon> <form name="form"> <button index="0" @@ -5804,7 +5359,16 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <notification icon="notify.tga" + name="TeleportOfferSent" + type="offer"> + Teleport offer sent to [TO_NAME] + </notification> + + + <notification + icon="notify.tga" name="GotoURL" + persist="true" type="notify"> [MESSAGE] [URL] @@ -5823,8 +5387,8 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <notification icon="notify.tga" name="OfferFriendship" - type="notify"> -[NAME] is offering friendship. + type="offer"> +[NAME_SLURL] is offering friendship. [MESSAGE] @@ -5843,7 +5407,15 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <notification icon="notify.tga" + name="FriendshipOffered" + type="offer"> + You have offered friendship to [TO_NAME] + </notification> + + <notification + icon="notify.tga" name="OfferFriendshipNoMessage" + persist="true" type="notify"> [NAME] is offering friendship. @@ -5863,23 +5435,39 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ <notification icon="notify.tga" name="FriendshipAccepted" - type="notify"> + type="offer"> [NAME] accepted your friendship offer. </notification> <notification icon="notify.tga" name="FriendshipDeclined" + persist="true" type="notify"> [NAME] declined your friendship offer. </notification> + + <notification + icon="notify.tga" + name="FriendshipAcceptedByMe" + type="offer"> +Friendship offer accepted. + </notification> <notification icon="notify.tga" + name="FriendshipDeclinedByMe" + type="offer"> +Friendship offer declined. + </notification> + + <notification + icon="notify.tga" name="OfferCallingCard" + persist="true" 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" @@ -5897,9 +5485,10 @@ This will add a bookmark in your inventory so you can quickly IM this resident. name="RegionRestartMinutes" priority="high" sound="UISndAlert" + persist="true" type="notify"> -Region is restarting in [MINUTES] minutes. -If you remain in this region you will be logged out. +This region will restart in [MINUTES] minutes. +If you stay in this region you will be logged out. </notification> <notification @@ -5907,9 +5496,10 @@ If you remain in this region you will be logged out. name="RegionRestartSeconds" priority="high" sound="UISndAlert" + persist="true" type="notify"> -Region is restarting in [SECONDS] seconds. -If you remain in this region you will be logged out. +This region will restart in [SECONDS] seconds. +If you stay in this region you will be logged out. </notification> <notification @@ -5936,6 +5526,7 @@ From object: [OBJECTNAME], owner: [NAME]? <notification icon="notify.tga" name="FailedToFindWearableUnnamed" + persist="true" type="notify"> Failed to find [TYPE] in database. </notification> @@ -5943,6 +5534,7 @@ Failed to find [TYPE] in database. <notification icon="notify.tga" name="FailedToFindWearable" + persist="true" type="notify"> Failed to find [TYPE] named [DESC] in database. </notification> @@ -5950,13 +5542,15 @@ Failed to find [TYPE] named [DESC] in database. <notification icon="notify.tga" name="InvalidWearable" + persist="true" type="notify"> - The item you are trying to wear uses a feature that your viewer can't read. Please upgrade your version of Second Life to wear this item. +The item you are trying to wear uses a feature that your Viewer can't read. Please upgrade your version of [APP_NAME] to wear this item. </notification> <notification icon="notify.tga" name="ScriptQuestion" + persist="true" type="notify"> '[OBJECTNAME]', an object owned by '[NAME]', would like to: @@ -5974,7 +5568,7 @@ Is this OK? <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -5982,11 +5576,12 @@ Is this OK? icon="notify.tga" name="ScriptQuestionCaution" priority="high" + persist="true" type="notify"> -'[OBJECTNAME]', an object owned by '[NAME]', would like to: +An object named '[OBJECTNAME]', owned by '[NAME]' would like to: [QUESTIONS] -If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button. +If you do not trust this object and its creator, you should deny the request. Grant this request? <form name="form"> @@ -6034,37 +5629,55 @@ Grant this request? </form> </notification> +<!-- <notification icon="notify.tga" name="FirstBalanceIncrease" + persist="true" type="notify"> You just received L$[AMOUNT]. -Objects and other users may give you L$. -Your balance is shown in the upper-right corner of the screen. +Your L$ balance is shown in the upper-right. </notification> <notification icon="notify.tga" name="FirstBalanceDecrease" + persist="true" type="notify"> You just paid L$[AMOUNT]. -Your balance is shown in the upper-right corner of the screen. +Your L$ balance is shown in the upper-right. + </notification> +--> + + <notification + icon="notify.tga" + name="BuyLindenDollarSuccess" + persist="true" + type="notify"> +Thank you for your payment! + +Your L$ balance will be updated when processing completes. If processing takes more than 20 mins, your transaction may be cancelled. In that case, the purchase amount will be credited to your US$ balance. + +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" + persist="true" type="notify"> You are sitting. -Use the arrow keys (or AWSD) to change the view. -Click the 'Stand Up' button to get up. +Use your arrow keys (or AWSD) to look around. +Click the 'Stand Up' button to stand. </notification> <notification icon="notify.tga" name="FirstMap" + persist="true" type="notify"> -Click and drag to scroll the map. +Click and drag the map to look around. Double-click to teleport. Use the controls on the right to find things and display different backgrounds. </notification> @@ -6072,33 +5685,37 @@ Use the controls on the right to find things and display different backgrounds. <notification icon="notify.tga" name="FirstBuild" + persist="true" type="notify"> -You can build new objects in some areas of [SECOND_LIFE]. -Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools. -Press Esc to stop building. +You have opened the Build Tools. Every object you see around you was created using these tools. </notification> +--> +<!-- <notification icon="notify.tga" name="FirstLeftClickNoHit" + persist="true" type="notify"> -Left-clicking interacts with special objects. -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. + Left-clicking interacts with special objects. + 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" + persist="true" type="notify"> -This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. -Your destination is marked with a tall beacon. -Follow the red arrow to the beacon, or click the arrow to dismiss the beacon. +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" + persist="true" type="notify"> Your movement keys are now being handled by an object. Try the arrow keys or AWSD to see what they do. @@ -6106,68 +5723,80 @@ 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" + persist="true" type="notify"> -You are editing your appearance. -To rotate and zoom view, use the arrow keys. -When you are finished, press 'Save All' to save your look and exit. -You can edit your appearance as often as you like. +You are editing your Appearance. +Use the arrow keys to look around. +When you are done, press 'Save All'. </notification> <notification icon="notify.tga" name="FirstInventory" + persist="true" type="notify"> -This is your inventory, which contains objects, notecards, clothing, and other things you own. -* To wear an object or outfit folder, drag it onto yourself. -* To bring an object into the world, drag it onto the ground. +This is your Inventory, which contains items you own. + +* To wear something, drag it onto yourself. +* To rez something inworld, drag it onto the ground. * To read a notecard, double-click it. </notification> +--> <notification icon="notify.tga" name="FirstSandbox" + persist="true" type="notify"> -This is a sandbox region. -Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name. +This is a sandbox area, and is meant to help Residents learn how to build. -Sandbox regions are uncommon, and are marked with signs. +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" + persist="true" type="notify"> -This object is flexible. -Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked. +This object is flexible. Flexis must be phantom and not physical. </notification> <notification icon="notify.tga" name="FirstDebugMenus" + persist="true" type="notify"> -You have enabled the Advanced menu. -This menu contains features useful for developers debugging Second Life. -To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D. +You opened the Advanced menu. + +To toggle this menu, + Windows: Ctrl+Alt+D + Mac: ⌥⌘D + </notification> <notification icon="notify.tga" name="FirstSculptedPrim" + persist="true" type="notify"> -You are editing a sculpted prim. -Sculpted prims require a special texture to specify their shape. -You can find example sculpted textures in the inventory library. +You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> +--> + <!-- <notification icon="notify.tga" name="FirstMedia" + persist="true" 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. + 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 icon="notifytip.tga" @@ -6181,7 +5810,7 @@ You may only select up to [MAX_SELECT] items from this list. name="VoiceInviteP2P" type="notify"> [NAME] is inviting you to a Voice Chat call. -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> </unique> @@ -6197,29 +5826,32 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> <notification icon="notify.tga" name="AutoUnmuteByIM" + persist="true" type="notify"> -[FIRST] [LAST] was sent an instant message and has been automatically unmuted. +[FIRST] [LAST] was sent an instant message and has been automatically unblocked. </notification> <notification icon="notify.tga" name="AutoUnmuteByMoney" + persist="true" type="notify"> -[FIRST] [LAST] was given money and has been automatically unmuted. +[FIRST] [LAST] was given money and has been automatically unblocked. </notification> <notification icon="notify.tga" name="AutoUnmuteByInventory" + persist="true" type="notify"> -[FIRST] [LAST] was offered inventory and has been automatically unmuted. +[FIRST] [LAST] was offered inventory and has been automatically unblocked. </notification> <notification @@ -6227,7 +5859,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t name="VoiceInviteGroup" type="notify"> [NAME] has joined a Voice Chat call with the group [GROUP]. -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> <context key="GROUP"/> @@ -6244,7 +5876,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6252,8 +5884,8 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t icon="notify.tga" name="VoiceInviteAdHoc" type="notify"> -[NAME] has joined a Voice Chat call with a conference chat... -Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user. +[NAME] has joined a voice chat call with a conference chat. +Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> </unique> @@ -6269,7 +5901,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6278,7 +5910,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t name="InviteAdHoc" type="notify"> [NAME] is inviting you to a conference chat. -Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user. +Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller. <unique> <context key="NAME"/> </unique> @@ -6294,7 +5926,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t <button index="2" name="Mute" - text="Mute"/> + text="Block"/> </form> </notification> @@ -6311,16 +5943,16 @@ The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum <notification icon="notifytip.tga" name="ProximalVoiceChannelFull" - type="notifytip"> + type="notifytip" + unique="true"> We're sorry. This area has reached maximum capacity for voice conversations. Please try to use voice in another area. - <unique/> </notification> <notification icon="notifytip.tga" name="VoiceChannelDisconnected" type="notifytip"> -You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to spatial voice chat. +You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnected to Nearby Voice Chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6330,7 +5962,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="VoiceChannelDisconnectedP2P" type="notifytip"> -[VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] has ended the call. You will now be reconnected to Nearby Voice Chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6340,7 +5972,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="P2PCallDeclined" type="notifytip"> -[VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] has declined your call. You will now be reconnected to Nearby Voice Chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6350,7 +5982,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="P2PCallNoAnswer" type="notifytip"> -[VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to spatial voice chat. +[VOICE_CHANNEL_NAME] is not available to take your call. You will now be reconnected to Nearby Voice Chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6360,7 +5992,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME]. You will now be reconnect icon="notifytip.tga" name="VoiceChannelJoinFailed" type="notifytip"> -Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to spatial voice chat. +Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now be reconnected to Nearby Voice Chat. <unique> <context key="VOICE_CHANNEL_NAME"/> </unique> @@ -6370,16 +6002,59 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now duration="10" icon="notifytip.tga" name="VoiceLoginRetry" - type="notifytip"> + type="notifytip" + unique="true"> We are creating a voice channel for you. This may take up to one minute. - <unique/> + </notification> + + <notification + icon="notify.tga" + name="VoiceEffectsExpired" + sound="UISndAlert" + persist="true" + type="notify" + unique="true"> +One or more of your subscribed Voice Morphs has expired. +[[URL] Click here] to renew your subscription. + </notification> + + <notification + icon="notify.tga" + name="VoiceEffectsExpiredInUse" + sound="UISndAlert" + persist="true" + type="notify" + unique="true"> +The active Voice Morph has expired, your normal voice settings have been applied. +[[URL] Click here] to renew your subscription. + </notification> + + <notification + icon="notify.tga" + name="VoiceEffectsWillExpire" + sound="UISndAlert" + persist="true" + type="notify" + unique="true"> +One or more of your Voice Morphs will expire in less than [INTERVAL] days. +[[URL] Click here] to renew your subscription. + </notification> + + <notification + icon="notify.tga" + name="VoiceEffectsNew" + sound="UISndAlert" + persist="true" + type="notify" + unique="true"> +New Voice Morphs are available! </notification> <notification icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> -Cannot enter parcel, you are not a member of the appropriate group. +Only members of a certain group can visit this area. </notification> <notification @@ -6422,25 +6097,386 @@ An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_N name="ServerVersionChanged" priority="high" type="notifytip"> -The region you have entered is running a different simulator version. Click this message for details. +You just entered a region using a different server version, which may affect performance. [[URL] View the release notes.] </notification> <notification icon="notifytip.tga" - name="UnableToOpenCommandURL" + name="UnsupportedCommandSLURL" priority="high" type="notifytip"> -The URL you clicked cannot be opened from this web browser. +The SLurl you clicked on is not supported. </notification> + <notification + icon="notifytip.tga" + name="BlockedSLURL" + priority="high" + type="notifytip"> +A SLurl was received from an untrusted browser and has been blocked for your security. + </notification> + + <notification + icon="notifytip.tga" + name="ThrottledSLURL" + priority="high" + type="notifytip"> +Multiple SLurls were received from an untrusted browser within a short period. +They will be blocked for a few seconds for your security. + </notification> + + <notification name="IMToast" type="notifytoast"> +[MESSAGE] + <form name="form"> + <button index="0" name="respondbutton" text="Respond"/> + </form> + </notification> + + <notification + icon="alert.tga" + name="ConfirmCloseAll" + type="alertmodal"> +Are you sure you want to close all IMs? + <usetemplate + name="okcancelignore" + notext="Cancel" + yestext="OK" + ignoretext="Confirm before I close all IMs"/> + </notification> + + <notification icon="notifytip.tga" + name="AttachmentSaved" type="notifytip"> +Attachment has been saved. + </notification> + + <notification + icon="alertmodal.tga" + name="UnableToFindHelpTopic" + type="alertmodal"> +Unable to find the help topic for this element. + </notification> + + <notification + icon="alertmodal.tga" + name="ObjectMediaFailure" + type="alertmodal"> +Server Error: Media update or get failed. +'[ERROR]' + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="TextChatIsMutedByModerator" + type="alertmodal"> +Your text chat has been muted by moderator. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="VoiceIsMutedByModerator" + type="alertmodal"> +Your voice has been muted by moderator. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmClearTeleportHistory" + type="alertmodal"> +Are you sure you want to delete your teleport history? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alert.tga" + name="BottomTrayButtonCanNotBeShown" + type="alert"> +Selected button can not be shown right now. +The button will be shown when there is enough space for it. + </notification> + + <notification + icon="notifytip.tga" + name="ShareNotification" + type="notifytip"> +Select residents to share with. + </notification> + <notification + icon="notifytip.tga" + name="ShareItemsConfirmation" + type="alertmodal"> +Are you sure you want to share the following items: + +[ITEMS] + +With the following Residents: + +[RESIDENTS] + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Ok"/> + </notification> + <notification + icon="notifytip.tga" + name="ItemsShared" + type="notifytip"> +Items successfully shared. + </notification> + <notification + icon="notifytip.tga" + name="DeedToGroupFail" + type="notifytip"> +Deed to group failed. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' declouded after [TIME] seconds. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezSelfBakedDoneNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +You finished baking your outfit after [TIME] seconds. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezSelfBakedUpdateNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +You sent out an update of your appearance after [TIME] seconds. +[STATUS] + </notification> + + + <notification + icon="notifytip.tga" + name="AvatarRezCloudNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' became cloud. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezArrivedNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' appeared. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezLeftCloudNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' left after [TIME] seconds as cloud. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezEnteredAppearanceNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' entered appearance mode. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezLeftAppearanceNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' left appearance mode. + </notification> + + <notification + icon="alertmodal.tga" + name="NoConnect" + type="alertmodal"> +We're having trouble connecting using [PROTOCOL] [HOSTID]. +Please check your network and firewall setup. + <form name="form"> + <button + default="true" + index="0" + name="OK" + text="OK"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" + name="NoVoiceConnect" + type="alertmodal"> +We're having trouble connecting to your voice server: + +[HOSTID] + +Voice communications will not be available. +Please check your network and firewall setup. + <form name="form"> + <button + default="true" + index="0" + name="OK" + text="OK"/> + </form> + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezLeftNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +Avatar '[NAME]' left as fully loaded. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezSelfBakedTextureUploadNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezSelfBakedTextureUpdateNotification" + type="notifytip"> +( [EXISTENCE] seconds alive ) +You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. + </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmLeaveCall" + type="alert"> +Are you sure you want to leave this call? + <usetemplate + ignoretext="Confirm before I leave call" + name="okcancelignore" + notext="No" + yestext="Yes" + unique="true"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ConfirmMuteAll" + type="alert"> +You have selected to mute all participants in a group call. +This will also cause all residents that later join the call to be +muted, even after you have left the call. + +Mute everyone? + <usetemplate + ignoretext="Confirm before I mute all participants in a group call" + name="okcancelignore" + yestext="Ok" + notext="Cancel" + unique="true"/> + </notification> + + <notification + name="HintChat" + label="Chat" + type="hint" + unique="true"> + To join the conversation, type into the chat field below. + </notification> + + <notification + name="HintSit" + label="Stand" + type="hint" + unique="true"> + To stand up and exit the sitting position, click the Stand button. + </notification> + + <notification + name="HintDestinationGuide" + label="Explore the World" + type="hint" + unique="true"> + The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring. + </notification> + + <notification + name="HintSidePanel" + label="Side Panel" + type="hint" + unique="true"> + Get quick access to your inventory, outfits, profiles and more in the side panel. + </notification> + + <notification + name="HintMove" + label="Move" + type="hint" + unique="true"> + To walk or run, open the Move Panel and use the directional arrows to navigate. You can also use the directional keys on your keyboard. + </notification> + + <notification + name="HintInventory" + label="Inventory" + type="hint" + unique="true"> + Check your inventory to find items. Newest items can be easily found in the Recent tab. + </notification> + + <notification + name="HintLindenDollar" + label="You've got Linden Dollars!" + type="hint" + unique="true"> + Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars. + </notification> + + <notification + name="PopupAttempt" + icon="Popup_Caution" + type="browser"> + A pop-up was prevented from opening. + <form name="form"> + <ignore name="ignore" + control="MediaEnablePopups" + invert_control="false" + text="Enable all pop-ups"/> + <button default="true" + index="0" + name="open" + text="Open pop-up window"/> + </form> + </notification> + + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> <global name="UnsupportedGLRequirements"> -You do not appear to have the proper hardware requirements for Second Life. Second Life requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. +You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. -If you continue to have problems, please visit: http://www.secondlife.com/support +If you continue to have problems, please visit the [SUPPORT_SITE]. </global> <global name="UnsupportedCPUAmount"> @@ -6459,12 +6495,14 @@ If you continue to have problems, please visit: http://www.secondlife.com/suppor - Your system memory does not meet the minimum requirements. </global> - <global name="PermYes"> -Yes +<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed + whenever the server string changes --> + <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> +If you own a piece of land, you can make it your home location. +Otherwise, you can look at the Map and find places marked "Infohub". </global> - - <global name="PermNo"> -No + <global name="You died and have been teleported to your home location"> +You died and have been teleported to your home location. </global> -</notifications> +</notifications> diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml new file mode 100644 index 0000000000..20ff492c0f --- /dev/null +++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder--> +<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime--> +<!-- Non of string values of controls below are visible to user. They are not need to be translated. --> +<accordion_tab + expanded="false" + follows="all" + height="45" + layout="topleft" + name="Mockup Tab" + selection_enabled="true" + tab_stop="false" + title="Mockup Tab" + translate="false" + width="0"> + <wearable_items_list + allow_select="true" + follows="all" + keep_one_selected="true" + multi_select="true" + name="wearable_items_list" + translate="false" + standalone="false" + /> +</accordion_tab> diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml new file mode 100644 index 0000000000..bef5f8dafd --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_activeim_row" + layout="topleft" + follows="left|right" + top="0" + left="0" + height="35" + width="318" + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > + <chiclet_script + name="object_chiclet" + layout="topleft" + follows="left" + top="3" + left="5" + height="25" + width="25" + visible="false" + speaker.name="speaker_p2p" + speaker.width="20" + speaker.height="25" + speaker.left="25" + speaker.top="25" + speaker.auto_update="true" + speaker.draw_border="false" + speaker.visible="false"> + </chiclet_script> + <chiclet_offer + name="inv_offer_chiclet" + layout="topleft" + follows="left" + top="3" + left="5" + height="25" + width="25" + visible="false" + speaker.name="speaker_p2p" + speaker.width="20" + speaker.height="25" + speaker.left="25" + speaker.top="25" + speaker.auto_update="true" + speaker.draw_border="false" + speaker.visible="false"> + </chiclet_offer> + <text + type="string" + name="object_name" + layout="topleft" + top="10" + left_pad="20" + height="14" + width="245" + length="1" + follows="right|left" + use_ellipses="true" + font="SansSerifBold"> + Unnamed Object + </text> + <button + top="10" + right="-5" + width="17" + height="17" + layout="topleft" + follows="right" + name="hide_btn" + mouse_opaque="true" + label="" + tab_stop="false" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + /> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml new file mode 100644 index 0000000000..3416b2369d --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="panel_activeim_row" + layout="topleft" + follows="left|right" + top="0" + left="0" + height="35" + width="318" + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > + <chiclet_im_p2p + name="p2p_chiclet" + layout="topleft" + follows="left" + top="3" + left="5" + height="25" + width="25" + visible="false" + speaker.name="speaker_p2p" + speaker.width="20" + speaker.height="25" + speaker.left="25" + speaker.top="25" + speaker.auto_update="true" + speaker.draw_border="false" + speaker.visible="false"> + </chiclet_im_p2p> + <chiclet_im_group + name="group_chiclet" + layout="topleft" + follows="left" + top="3" + left="5" + height="25" + width="25" + visible="false" + speaker.name="speaker_grp" + speaker.width="20" + speaker.height="25" + speaker.left="25" + speaker.top="25" + speaker.auto_update="true" + speaker.draw_border="false" + speaker.visible="false"> + </chiclet_im_group> + <chiclet_im_adhoc + name="adhoc_chiclet" + layout="topleft" + follows="left" + top="3" + left="5" + height="25" + width="25" + visible="false" + speaker.name="speaker_hoc" + speaker.width="20" + speaker.height="25" + speaker.left="25" + speaker.top="25" + speaker.auto_update="true" + speaker.draw_border="false" + speaker.visible="false"> + </chiclet_im_adhoc> + <text + type="string" + name="contact_name" + layout="topleft" + top="10" + left_pad="10" + height="14" + width="255" + length="1" + follows="right|left" + use_ellipses="true" + font="SansSerifBold"> + Grumpity ProductEngine + </text> + <button + top="10" + right="-5" + width="17" + height="17" + layout="topleft" + follows="right" + name="hide_btn" + mouse_opaque="true" + label="" + tab_stop="false" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + /> +</panel>
\ No newline at end of file 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 new file mode 100644 index 0000000000..e70abc0975 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + follows="all" + height="215" + name="panel_im_control_panel" + width="150"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="215" + layout="topleft" + left="3" + name="vertical_stack" + orientation="vertical" + top="0" + width="147"> + <layout_panel + auto_resize="true" + follows="top|left" + height="130" + layout="topleft" + left="0" + min_height="0" + mouse_opaque="false" + width="147" + top="0" + name="speakers_list_panel" + user_resize="false"> + <avatar_list + color="DkGray2" + follows="all" + height="130" + ignore_online_status="true" + layout="topleft" + name="speakers_list" + opaque="false" + show_info_btn="true" + show_profile_btn="false" + show_speaking_indicator="false" + width="147" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="130" + name="call_btn_panel" + user_resize="false" + visible="false"> + <button + follows="all" + height="20" + label="Call" + name="call_btn" + width="130" + top="5" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="130" + name="end_call_btn_panel" + user_resize="false" + visible="false"> + <button + follows="all" + height="20" + label="Leave Call" + name="end_call_btn" + top="5"/> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="130" + name="voice_ctrls_btn_panel" + user_resize="false" + visible="false"> + <button + follows="all" + height="20" + label="Voice Controls" + name="voice_ctrls_btn" + top="5" + use_ellipses="true" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml deleted file mode 100644 index 5f495ef8ce..0000000000 --- a/indra/newview/skins/default/xui/en/panel_audio_device.xml +++ /dev/null @@ -1,153 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - height="240" - layout="topleft" - left="8" - name="device_settings" - top="240" - width="404"> - <panel.string - name="default_text"> - Default - </panel.string> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="6" - name="Audio Devices" - width="200"> - Audio Devices - </text> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="20" - name="Input device (microphone):" - top="26" - width="200"> - Input device (microphone): - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - max_chars="128" - name="voice_input_device" - top_pad="2" - width="225" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left_delta="0" - name="Output device (speakers):" - top_pad="9" - width="200"> - Output device (speakers): - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - max_chars="128" - name="voice_output_device" - top_pad="2" - width="225" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="6" - name="Input level:" - top="121" - width="200"> - Input Level - </text> - <text_editor - type="string" - length="1" - top="135" - bg_readonly_color="0 0 0 0" - enabled="false" - height="60" - hide_border="true" - hide_scrollbar="true" - layout="topleft" - left_delta="10" - max_length="65535" - name="voice_intro_text1" - tab_stop="false" - width="380" - word_wrap="true"> - Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone. - </text_editor> - <slider_bar - follows="left|top" - height="17" - increment="0.05" - initial_value="1.0" - layout="topleft" - left_delta="5" - max_val="2" - name="mic_volume_slider" - tool_tip="Change the volume using this slider" - top="202" - width="90" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_pad="5" - name="wait_text" - top_delta="1" - width="200"> - Please wait - </text> - <locate - height="20" - layout="topleft" - left_delta="0" - name="bar0" - top_delta="5" - width="20" /> - <locate - height="20" - layout="topleft" - left_pad="2" - name="bar1" - top_delta="0" - width="20" /> - <locate - height="20" - layout="topleft" - left_pad="2" - name="bar2" - top_delta="0" - width="20" /> - <locate - height="20" - layout="topleft" - left_pad="2" - name="bar3" - top_delta="0" - width="20" /> - <locate - height="20" - layout="topleft" - left_pad="2" - name="bar4" - top_delta="0" - width="20" /> -</panel> 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 bf3f70f54b..6f3629cc8f 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 @@ -1,65 +1,158 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- All our XML is utf-8 encoded. --> - +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - name="avatar_list_item" - title="avatar_list_item" - visible="true" - width="314" - height="30" - left="0" - top="100" - follows="bottom|right|left" - min_width="150" - max_height="30" - - background_opaque="false" - background_visible="true" - bevel_style="in" - bg_alpha_color="0.3 0.3 0.3 1.0"> - - <avatar_icon - bottom="5" left="5" width="20" height="20" follows="top|left" - color="1 1 1 1" enabled="true" image_name="smile.png" - mouse_opaque="true" name="avatar_icon" - /> - - <text - bottom="4" left="35" width="160" height="20" follows="right|left" - font="SansSerifBigBold" text_color="white" - mouse_opaque="true" name="user_name" > - Boris Linden - </text> - - <text - bottom="3" left="190" width="40" height="20" follows="right" - font="SansSerif" text_color="0.5 0.5 0.5 1.0" - mouse_opaque="true" name="user_status" > - Away - </text> - - <icon - bottom="5" left="230" width="20" height="20" follows="right" - color="1 1 1 1" enabled="true" image_name="speaking_indicator.tga" - mouse_opaque="true" name="locator" - /> - - <button - bottom="5" left="260" width="20" height="20" follows="right" - name="info_btn" label="" - image_unselected="info_btn.tga" image_disabled="info_btn.tga" - image_selected="info_btn_active.tga" image_hover_selected="info_btn_active.tga" - image_disabled_selected="info_btn.tga" font="SansSerifBigBold" - /> - - <button - bottom="5" left="290" width="20" height="20" follows="right" - name="profile_btn" label="" - image_unselected="profile_chevron_btn.tga" image_disabled="profile_chevron_btn.tga" - image_selected="profile_chevron_btn_active.tga" image_hover_selected="profile_chevron_btn_active.tga" - image_disabled_selected="profile_chevron_btn.tga" font="SansSerifBigBold" - /> - - - -</panel> + follows="top|right|left" + height="24" + layout="topleft" + left="0" + name="avatar_list_item" + top="0" + width="320"> + <!-- + Strings used to localize last interaction time. + See last_interaction textbox below. + --> + <string name="FormatSeconds">[COUNT]s</string> + <string name="FormatMinutes">[COUNT]m</string> + <string name="FormatHours">[COUNT]h</string> + <string name="FormatDays">[COUNT]d</string> + <string name="FormatWeeks">[COUNT]w</string> + <string name="FormatMonths">[COUNT]mon</string> + <string name="FormatYears">[COUNT]y</string> + + <!-- + *NOTE: llavatarlistitem.cpp lays these controls out depending on which + ones are visible. Trying to change their order here will break it + ... which kinda sucks. + --> + <icon + follows="top|right|left" + height="24" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="320" /> + <icon + height="24" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="320" /> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left="5" + mouse_opaque="true" + top="2" + width="20" /> + <text + follows="left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="avatar_name" + top="6" + use_ellipses="true" + value="Unknown" + width="180" /> + <text + follows="right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + right="-164" + name="last_interaction" + text_color="LtGray_50" + value="0s" + width="35" /> + <icon + height="16" + follows="right" + image_name="Permission_Edit_Objects_Theirs" + layout="topleft" + left_pad="3" + right="-129" + name="permission_edit_theirs_icon" + tool_tip="You can edit this friend's objects" + top="4" + width="16" /> + <icon + height="16" + follows="right" + image_name="Permission_Edit_Objects_Mine" + layout="topleft" + left_pad="3" + right="-110" + name="permission_edit_mine_icon" + tool_tip="This friend can edit, delete or take your objects" + top_delta="0" + width="16" /> + <icon + height="16" + follows="right" + image_name="Permission_Visible_Map" + layout="topleft" + left_pad="3" + tool_tip="This friend can locate you on the map" + right="-91" + name="permission_map_icon" + top_delta="0" + width="16" /> + <icon + height="16" + follows="right" + image_name="Permission_Visible_Online" + layout="topleft" + left_pad="3" + right="-72" + name="permission_online_icon" + tool_tip="This friend can see when you're online" + top_delta="0" + width="16" /> + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + layout="topleft" + left_pad="3" + right="-53" + name="info_btn" + tab_stop="false" + top_delta="0" + width="16" /> + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" + layout="topleft" + left_pad="5" + right="-28" + name="profile_btn" + tab_stop="false" + tool_tip="View profile" + top_delta="-2" + width="20" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + height="16" + layout="topleft" + left_pad="5" + right="-3" + mouse_opaque="true" + name="speaking_indicator" + visible="true" + width="20" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml new file mode 100644 index 0000000000..b779b08a63 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + name="avatar_tag_notification" + top="10" + width="250" + height="100" + follows="all"> + <panel + width="240" + height="24" + left="5" + background_visible="true" + background_opaque="false" + follows="left|top|right" + top="-5" + bg_alpha_color="black" + name="msg_caption"> + <avatar_icon + top="-3" + left="3" + width="18" + image_name="Generic_Person" + height="18" + follows="left|top" + enabled="true" + name="avatar_tag_icon" /> + <text + width="160" + top="-8" + left="30" + height="20" + follows="left|right|top" + font.style="BOLD" + text_color="white" + word_wrap="true" + mouse_opaque="true" + name="sender_tag_name"> + Angela Tester + </text> + <text + font="SansSerifSmall" + follows="right" + height="13" + layout="topleft" + halign="right" + right="-5" + name="tag_time" + top="8" + value="23:30" + width="50" /> + </panel> + <text_editor + bg_readonly_color="DkGray" + font="SansSerifSmall" + top="65" + left="5" + right="-5" + height="100" + follows="all" + read_only="true" + word_wrap="true" + mouse_opaque="true" + name="msg_text"> + The quick brown fox jumps over the lazy dog. + </text_editor> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_bars.xml b/indra/newview/skins/default/xui/en/panel_bars.xml deleted file mode 100644 index 9c06329eaf..0000000000 --- a/indra/newview/skins/default/xui/en/panel_bars.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="left|right|top|bottom" - height="768" - layout="topleft" - left="0" - mouse_opaque="false" - name="bottom_panel" - width="1024"> - <panel - follows="left|right|top|bottom" - height="728" - layout="topleft" - left="0" - mouse_opaque="false" - name="status" - top="0" - width="1024" /> - <layout_stack - border_size="0" - follows="left|right|bottom|top" - height="768" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="bar_stack" - top_delta="0" - use_bounding_rect="true" - width="1024"> - <layout_panel - follows="left|right|top|bottom" - height="768" - layout="topleft" - left="0" - mouse_opaque="false" - name="spacer" - top="0" - user_resize="false" - width="1024" /> - <layout_panel - auto_resize="false" - height="200" - layout="topleft" - min_height="200" - mouse_opaque="false" - name="overlay" - use_bounding_rect="true" - user_resize="false" - width="1024" /> - <layout_panel - auto_resize="false" - filename="panel_toolbar.xml" - layout="topleft" - min_height="28" - name="toolbar" - use_bounding_rect="true" - user_resize="false" - width="1024" /> - </layout_stack> - <panel - follows="left|right|top|bottom" - height="728" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="hud" - top_delta="-10" - width="1024" /> -</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 new file mode 100644 index 0000000000..1e6a31d388 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="left|top|right|bottom" + height="305" + layout="topleft" + name="block_list_panel" + help_topic="blocked_list" + min_height="350" + min_width="240" + width="280"> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back" + left="4" + tab_stop="false" + top="1" + width="30"/> + <text + follows="top|left|right" + font="SansSerifLargeBold" + height="20" + layout="topleft" + left_pad="10" + name="title_text" + text_color="white" + top="5" + width="250"> + Block List + </text> + <scroll_list + follows="all" + height="190" + layout="topleft" + left="5" + name="blocked" + tool_tip="List of currently blocked Residents" + top="30" + width="270"> + <scroll_list.columns + name="item_name" /> + <scroll_list.columns + name="item_type" + width="96" /> + </scroll_list> + <button + follows="left|bottom" + height="23" + label="Block person" + layout="topleft" + left_delta="0" + name="Block resident..." + tool_tip="Pick a Resident to block" + top_pad="4" + width="210"> + <button.commit_callback + function="Block.ClickPick" /> + </button> + <button + follows="left|bottom" + height="23" + label="Block object by name" + layout="topleft" + left_delta="0" + name="Block object by name..." + tool_tip="Pick an object to block by name" + top_pad="4" + width="210" > + <button.commit_callback + function="Block.ClickBlockByName" /> + </button> + <button + enabled="false" + follows="left|bottom" + height="23" + label="Unblock" + layout="topleft" + left_delta="0" + name="Unblock" + tool_tip="Remove Resident or object from blocked list" + top_pad="4" + width="210" > + <button.commit_callback + function="Block.ClickRemove" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml new file mode 100644 index 0000000000..216a265164 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="wearable_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="22" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="1" + visible="false" + width="380" /> + <icon + height="22" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="1" + visible="false" + width="380" /> + <icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="0" + name="item_icon" + top="2" + width="16" /> + <text + follows="left|right" + height="16" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> + <panel + background_visible="false" + name="btn_lock" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="You don't have permission to edit"> + <icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + </panel> + <panel + background_visible="false" + name="btn_edit_panel" + layout="topleft" + follows="top|right" + top="1" + left_pad="3" + height="23" + width="26" + tab_stop="false"> + <button + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Edit this shape"/> + </panel> + <icon + follows="left|right|top" + height="3" + image_name="Wearables_Divider" + layout="bottomleft" + left="0" + name="wearable_type_separator_icon" + top="0" + visible="true" + width="380"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml new file mode 100644 index 0000000000..dc123f13f4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> + +<panel + follows="left|right|top" + height="35" + layout="topleft" + left="0" + name="clothing_list_button_bar_panel" + top="0" + visible="true" + width="300"> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + label="Switch" + layout="topleft" + left="5" + name="switch_btn" + top="5" + width="45" /> + <button + follows="top|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Shop" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + right="-5" + name="bodyparts_shop_btn" + top="5" + width="45" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 303487f21b..63068a069f 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -1,41 +1,510 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel follows="left|bottom|right" name="bottom_tray" bg_opaque_color="0.25 0.25 0.25 1.0" - bg_alpha_color="0.25 0.25 0.25 1.0" background_visible="true" auto_resize="true" - left="0" bottom="0" width="1000" height="28" border_visible="false" has_border="false"> - <layout_stack name="toolbar_stack" follows="left|right|bottom|top" - bottom="0" left="0" width="1000" height="25" orientation="horizontal" border_size="0" auto_resize="false"> - - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28"> - <line_editor name="chat_box" follows="left|right" - width="250" height="20" left="0" bottom="6" - bevel_style="in" border_style="line" border_thickness="1"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <view_border bevel_style="in" bottom="0" height="28" min_height="28" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="100" height="28" min_height="28"> - <chiclet_talk name="talk" left="0" bottom="6" width="100" height="20" follows="left|right" auto_resize="false"/> - </panel> - <icon name="DUMMY" image_name="spacer24.tga" left="0" width="150" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28"> - <chiclet_panel name="chiclet_list" follows="left|right" - width="250" height="25" left="0" bottom="2"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="40" height="28" min_height="28"> - <chiclet_notification name="im_well" follows="left|right" auto_resize="false" - left="0" bottom="4" width="40" height="25" - image_unselected="im_notifications.tga" image_selected="im_notifications.tga"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <view_border bevel_style="in" bottom="0" height="30" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/> - <icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - <panel follows="left|right" auto_resize="false" width="48" height="28" min_height="28"> - <chiclet_notification name="sys_well" follows="left|right" auto_resize="false" - left="0" bottom="5" width="48" height="25" - image_unselected="sys_notifications.tga" image_selected="sys_notifications.tga"/> - </panel> - <icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/> - </layout_stack> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + chrome="true" + follows="left|bottom|right" + height="33" + layout="topleft" + left="0" + name="bottom_tray" + top="28" + width="1310"> + <string + name="DragIndicationImageName" + value="Accordion_ArrowOpened_Off" /> + <string + name="SpeakBtnToolTip" + value="Turns microphone on/off" /> + <string + name="VoiceControlBtnToolTip" + value="Shows/hides voice control panel" /> + <layout_stack + border_size="0" + clip="false" + follows="all" + height="28" + layout="topleft" + left="0" + mouse_opaque="false" + name="toolbar_stack" + orientation="horizontal" + top="0" + width="1310"> + <layout_panel + auto_resize="false" + user_resize="false" + min_width="2" + width="2" /> + <layout_panel + auto_resize="false" + layout="topleft" + max_width="320" + min_width="214" + height="28" + mouse_opaque="false" + name="chat_bar_layout_panel" + user_resize="true" + width="308" > + <panel + name="chat_bar" + filename="panel_nearby_chat_bar.xml" + left="0" + height="28" + width="308" + top="0" + mouse_opaque="false" + follows="left|right" + /> + </layout_panel> + <!-- + There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap) + --> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="59" + mouse_opaque="false" + name="speak_panel" + top_delta="0" + user_resize="true" + width="110"> + <talk_button + follows="left|right" + height="23" + layout="topleft" + left="2" + name="talk" + top="5" + width="105"> + <show_button + tab_stop="true"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="voice_controls" /> + </show_button> + <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales. + & pad_right is default value for long label which can be right aligned. See EXT-6318 --> + <speak_button + halign="center" + label="Speak" + label_selected="Speak" + name="speak_btn" + pad_right="20" + tab_stop="true" + use_ellipses="true" /> + </talk_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="65" + mouse_opaque="false" + name="gesture_panel" + top_delta="0" + user_resize="false" + width="85"> + <gesture_combo_list + follows="left|right" + height="23" + label="Gesture" + layout="topleft" + left="0" + name="Gesture" + tool_tip="Shows/hides gestures" + top="5" + width="82"> + <combo_button + pad_right="10" + use_ellipses="true" /> + <combo_list + page_lines="17" /> + </gesture_combo_list> + </layout_panel> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="movement_panel" + user_resize="false" + width="83"> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Move" + layout="topleft" + name="movement_btn" + tool_tip="Shows/hides movement controls" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="moveview" /> + </bottomtray_button> + + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="cam_panel" + user_resize="false" + width="83"> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="View" + layout="topleft" + left="0" + name="camera_btn" + tool_tip="Shows/hides camera controls" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="camera" /> + </bottomtray_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_width="40" + mouse_opaque="false" + name="snapshot_panel" + user_resize="false" + width="39"> + <bottomtray_button + follows="left|right" + height="23" + image_overlay="Snapshot_Off" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + layout="topleft" + left="0" + name="snapshots" + tool_tip="Take snapshot" + top="5" + width="36"> + <init_callback + function="Button.SetFloaterToggle" + parameter="snapshot" /> + </bottomtray_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="build_btn_panel" + user_resize="false" + width="83"> +<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon. +Disabled for now. +--> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Build" + layout="topleft" + left="0" + name="build_btn" + tool_tip="Shows/hides Build Tools" + top="5" + use_ellipses="true" + width="80"> + <commit_callback + function="Build.Toggle" + parameter="build" /> + </bottomtray_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="search_btn_panel" + user_resize="false" + width="83"> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Search" + layout="topleft" + left="0" + name="search_btn" + tool_tip="Shows/hides Search" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="Button.SetFloaterToggle" + parameter="search" /> + </bottomtray_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="world_map_btn_panel" + user_resize="false" + width="83"> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Map" + layout="topleft" + left="0" + name="world_map_btn" + tool_tip="Shows/hides World Map" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="Button.SetFloaterToggle" + parameter="world_map" /> + </bottomtray_button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" + name="mini_map_btn_panel" + user_resize="false" + width="83"> + <bottomtray_button + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Mini-Map" + layout="topleft" + left="0" + name="mini_map_btn" + tool_tip="Shows/hides Mini-Map" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="Button.SetFloaterToggle" + parameter="mini_map" /> + </bottomtray_button> + </layout_panel> + <layout_panel + follows="left|right" + height="30" + layout="topleft" + min_width="95" + mouse_opaque="false" + name="chiclet_list_panel" + top="0" + user_resize="false" + width="189"> +<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same +as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991--> + <chiclet_panel + chiclet_padding="4" + follows="left|right" + height="24" + layout="topleft" + left="1" + min_width="95" + mouse_opaque="false" + name="chiclet_list" + top="7" + width="189"> + <button + auto_resize="true" + follows="right" + height="29" + image_hover_selected="SegmentedBtn_Left_Over" + image_hover_unselected="SegmentedBtn_Left_Over" + image_overlay="Arrow_Small_Left" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Press" + image_selected="SegmentedBtn_Left_Off" + image_unselected="SegmentedBtn_Left_Off" + layout="topleft" + name="chicklet_left_scroll_button" + tab_stop="false" + top="-28" + visible="false" + width="7" /> + <button + auto_resize="true" + follows="right" + height="29" + image_hover_selected="SegmentedBtn_Right_Over" + image_hover_unselected="SegmentedBtn_Right_Over" + image_overlay="Arrow_Small_Right" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Press" + image_selected="SegmentedBtn_Right_Off" + image_unselected="SegmentedBtn_Right_Off" + layout="topleft" + name="chicklet_right_scroll_button" + tab_stop="false" + top="-28" + visible="false" + width="7" /> + </chiclet_panel> + </layout_panel> + <layout_panel auto_resize="false" + user_resize="false" + width="4" + min_width="4"/> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="37" + name="im_well_panel" + top="0" + user_resize="false" + width="37"> + <chiclet_im_well + follows="right" + height="28" + layout="topleft" + left="0" + max_displayed_count="99" + name="im_well" + top="0" + width="35"> + <!-- +Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button +xml attribute Description +image_unselected "Unlit" - there are no new messages +image_selected "Unlit" + "Selected" - there are no new messages and the Well is open +image_pressed "Lit" - there are new messages +image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open + --> + <button + auto_resize="true" + follows="right" + halign="center" + height="23" + image_overlay="Unread_IM" + image_overlay_alignment="center" + image_pressed="WellButton_Lit" + image_pressed_selected="WellButton_Lit_Selected" + image_selected="PushButton_Press" + label_color="Black" + left="0" + name="Unread IM messages" + tool_tip="Conversations" + width="34"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="im_well_window" /> + </button> + </chiclet_im_well> + </layout_panel> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="37" + name="notification_well_panel" + top="0" + user_resize="false" + width="37"> + <chiclet_notification + follows="right" + height="23" + layout="topleft" + left="0" + max_displayed_count="99" + name="notification_well" + top="5" + width="35"> + <button + auto_resize="true" + bottom_pad="3" + follows="right" + halign="center" + height="23" + image_overlay="Notices_Unread" + image_overlay_alignment="center" + image_pressed="WellButton_Lit" + image_pressed_selected="WellButton_Lit_Selected" + image_selected="PushButton_Press" + label_color="Black" + left="0" + name="Unread" + tool_tip="Notifications" + width="34"> + <init_callback + function="Button.SetDockableFloaterToggle" + parameter="notification_well_window" /> + </button> + </chiclet_notification> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + min_width="4" + name="DUMMY2" + width="8" /> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml new file mode 100644 index 0000000000..efb1da4c05 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + default_tab_group="2" + mouse_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="left|bottom|right" + height="33" + layout="topleft" + left="0" + name="bottom_tray_lite" + tab_stop="true" + top="28" + chrome="true" + border_visible="false" + visible="false" + width="1000"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="28" + layout="topleft" + left="0" + name="toolbar_stack_lite" + orientation="horizontal" + top="0" + width="1000"> + <layout_panel + auto_resize="false" + user_resize="false" + min_width="2" + width="2" /> + <layout_panel + mouse_opaque="false" + auto_resize="true" + height="28" + layout="topleft" + width="310" + min_width="188" + user_resize="false"> + <panel + left="0" + filename="panel_nearby_chat_bar.xml" + follows="left|right" + top="4" + width="310" + name="chat_bar" + mouse_opaque="false"/> + </layout_panel> + <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + width="82" + top_delta="0" + min_width="52" + name="gesture_panel" + user_resize="false"> + <gesture_combo_list + follows="left|right" + height="23" + label="Gesture" + layout="topleft" + name="Gesture" + left="0" + top="5" + width="82" + tool_tip="Shows/hides gestures"> + <gesture_combo_list.combo_button + pad_right="10" + use_ellipses="true" /> + </gesture_combo_list> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + min_width="3" + name="after_gesture_panel" + width="3"/> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml new file mode 100644 index 0000000000..17e8d4d2df --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bevel_style="in" + bg_opaque_color="Black" + bg_alpha_color="DkGray_66" + follows="top|left|right" + height="24" + label="im_header" + layout="topleft" + name="im_header" + width="310"> + <avatar_icon + follows="left" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="true" + name="avatar_icon" + top="3" + width="18" /> + <text + parse_urls="false" + allow_scroll="false" + v_pad = "7" + read_only = "true" + follows="left|right" + font.style="BOLD" + height="24" + layout="topleft" + left_pad="5" + right="-120" + name="user_name" + text_color="white" + bg_readonly_color="black" + top="0" + use_ellipses="true" + valign="bottom" + value="Ericag Vader" /> + <text + allow_scroll="false" + font="SansSerifSmall" + follows="right" + halign="right" + height="13" + layout="topleft" + left_pad="5" + name="time_box" + right="-5" + top="8" + value="23:30" + width="110" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml new file mode 100644 index 0000000000..34c6e02684 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> +<panel + name="instant_message" + width="315" + height="180" + follows="all"> + <avatar_icon + follows="left|top" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="true" + name="avatar_icon" + top="3" + width="18" /> + <text_chat + top="5" + left="30" + height="120" + text_color="white" + word_wrap="true" + mouse_opaque="true" + name="msg_text"> + </text_chat> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml new file mode 100644 index 0000000000..357dbc07cc --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="black" + follows="left|right|top" + height="0" + layout="topleft" + name="chat_separator_panel" /> diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml deleted file mode 100644 index f2cec86b38..0000000000 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="bottom|left" - height="490" - label="Classified" - layout="topleft" - left="330" - name="Classified" - top="490" - width="450"> - <panel.string - name="ad_placed_paid"> - Ad placed: [DATE], Paid L$[AMT] for listing. - </panel.string> - <panel.string - name="update_txt"> - Update - </panel.string> - <panel.string - name="publish_txt"> - Publish... - </panel.string> - <panel.string - name="dateStr"> - [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] - </panel.string> - <texture_picker - follows="left|top" - height="300" - layout="topleft" - left="20" - name="snapshot_ctrl" - top="15" - width="400" /> - <line_editor - enabled="false" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left_delta="0" - name="given_name_editor" - tool_tip="Name must begin with a letter or number, not punctuation." - top_delta="288" - width="400" /> - <text_editor - enabled="false" - follows="left|top" - height="90" - layout="topleft" - left="20" - max_length="1023" - name="desc_editor" - width="400" - word_wrap="true" /> - <line_editor - enabled="false" - follows="left|top" - font="SansSerif" - height="20" - layout="topleft" - left="20" - name="location_editor" - tool_tip="Set the location for this classified to your current position." - width="400" /> - <button - follows="left|top" - height="20" - label="Set" - layout="topleft" - left_delta="360" - name="set_location_btn" - top_delta="0" - width="60" /> - <button - follows="left|top" - height="20" - label="Teleport" - layout="topleft" - left="20" - name="classified_teleport_btn" - top="449" - width="100" /> - <button - follows="left|top" - height="20" - label="Show on Map" - layout="topleft" - left_pad="5" - name="classified_map_btn" - top_delta="0" - width="100" /> - <button - follows="left|top" - height="20" - label="Profile" - layout="topleft" - left_pad="5" - name="classified_profile_btn" - top_delta="0" - width="100" /> - <combo_box - height="20" - layout="topleft" - left="30" - name="classified_mature_check" - top="48" - width="130"> - <combo_box.item - label="- Select Mature -" - value="Select" /> - <combo_box.item - label="Mature Content" - value="Mature" /> - <combo_box.item - label="PG Content" - value="Not Mature" /> - </combo_box> - <combo_box - bottom="45" - height="18" - layout="topleft" - left="20" - name="classified_category_combo" - right="150" /> - <button - follows="left|top" - height="20" - label="Update" - layout="topleft" - left="30" - name="classified_update_btn" - top="70" - width="70" /> -</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 new file mode 100644 index 0000000000..0fb7691ee7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -0,0 +1,471 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="570" + layout="topleft" + left="0" + min_height="350" + name="panel_classified_info" + help_topic="profile_classified_info" + top="0" + width="333"> + <panel.string + name="type_mature"> + Moderate + </panel.string> + <panel.string + name="type_pg"> + General Content + </panel.string> + <panel.string + name="l$_price"> + L$[PRICE] + </panel.string> + <panel.string + name="click_through_text_fmt"> + [TELEPORT] teleport, [MAP] map, [PROFILE] profile + </panel.string> + <panel.string + name="date_fmt"> + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] + </panel.string> + <panel.string + name="auto_renew_on"> + Enabled + </panel.string> + <panel.string + name="auto_renew_off"> + Disabled + </panel.string> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back_btn" + left="10" + tab_stop="false" + top="2" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="4" + name="title" + text_color="LtGray" + top="0" + value="Classified Info" + use_ellipses="true" + width="275" /> + <scroll_container + color="DkGray2" + opaque="true" + follows="all" + height="502" + layout="topleft" + left="10" + top_pad="10" + name="profile_scroll" + reserve_scroll_corner="false" + width="312"> + <panel + name="scroll_content_panel" + follows="left|top" + min_height="300" + layout="topleft" + top="0" + background_visible="false" + height="610" + left="0" + width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="275" + > + <texture_picker + fallback_image="default_land_picture.j2c" + enabled="false" + follows="left|top|right" + height="197" + layout="topleft" + left="0" + name="classified_snapshot" + top="0" + width="275" /> + </panel> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top|right" + h_pad="0" + height="35" + width="290" + layout="topleft" + font="SansSerifBig" + font.style="BOLD" + left="10" + top_pad="10" + name="classified_name" + read_only="true" + text_color="white" + v_pad="0" + value="[name]" + use_ellipses="true" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="classified_location_label" + text_color="white" + top_pad="5" + value="Location:" + width="250" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + height="30" + layout="topleft" + left="10" + name="classified_location" + read_only="true" + top_pad="5" + width="290" + word_wrap="true" + v_pad="0" + value="[loading...]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="content_type_label" + text_color="white" + top_pad="10" + value="Content Type:" + width="140" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_M_Light" + layout="topleft" + left_pad="0" + name="content_type_moderate" + top_pad="-11" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_PG_Light" + layout="topleft" + left_delta="0" + name="content_type_general" + top_delta="0" + width="18" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top|right" + h_pad="0" + height="18" + layout="topleft" + left_pad="2" + name="content_type" + read_only="true" + width="130" + top_delta="1" + v_pad="0" + value="[content type]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="0" + value="Category:" + width="140" /> + <text_editor + parse_urls="true" + allow_scroll="false" + bg_visible="false" + follows="left|top|right" + h_pad="0" + height="18" + layout="topleft" + left_pad="0" + name="category" + read_only="true" + width="150" + top_pad="-10" + v_pad="0" + value="[category]" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="creation_date_label" + text_color="white" + top_pad="0" + value="Creation date:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="creation_date" + read_only="true" + top_pad="-10" + tool_tip="Creation date" + v_pad="0" + value="[date]" + width="150" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="price_for_listing_label" + text_color="white" + top_pad="5" + value="Price for listing:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="price_for_listing" + read_only="true" + top_pad="-10" + tool_tip="Price for listing." + v_pad="0" + value="[price]" + width="105" /> + <layout_stack + animate="false" + name="descr_stack" + layout="topleft" + follows="all" + orientation="vertical" + left="10" + top_pad="5" + width="290" + height="215"> + <layout_panel + auto_resize="false" + name="clickthrough_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="16" + user_resize="false"> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="click_through_label" + text_color="white" + top_pad="0" + value="Clicks:" + width="140" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + halign="left" + height="16" + layout="topleft" + left_pad="0" + name="click_through_text" + read_only="true" + top_pad="-10" + tool_tip="Click through data" + v_pad="0" + value="[clicks]" + width="150" /> + </layout_panel> + <layout_panel + auto_resize="false" + name="price_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="16" + user_resize="false"> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="auto_renew_label" + text_color="white" + top="0" + value="Auto renew:" + width="140" /> + <text + height="16" + layout="topleft" + follows="top|left" + left_pad="0" + name="auto_renew" + top_pad="-10" + value="Enabled" + width="150" /> + </layout_panel> + <layout_panel + name="descr_layout_panel" + layout="topleft" + follows="all" + left="0" + top="0" + width="290" + height="215" + user_resize="false"> + <text + auto_resize="false" + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="0" + name="classified_desc_label" + text_color="white" + top="0" + value="Description:" + width="250" /> + <text_editor + parse_urls="true" + allow_scroll="true" + bg_visible="false" + follows="all" + h_pad="0" + height="200" + layout="topleft" + left="0" + max_length="1023" + name="classified_desc" + read_only="true" + top_pad="7" + width="280" + v_pad="0" + value="[description]" + word_wrap="true" /> + </layout_panel> + </layout_stack> + </panel> + </scroll_container> + <panel + follows="left|right|bottom" + height="35" + layout="topleft" + top_pad="5" + left="9" + name="buttons"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="0" + orientation="horizontal" + top_pad="0" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="0" + name="teleport_btn" + top="0" + width="101" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="100"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + top="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + name="edit_btn" + top="0" + width="101" /> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml new file mode 100644 index 0000000000..27c653bc35 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bevel_style="none" + follows="top|left|right" + height="85" + layout="topleft" + left="0" + name="classified_item" + top="0" + width="313"> + <icon + follows="all" + height="85" + image_name="ListItem_Over" + right="-2" + mouse_opaque="false" + name="hovered_icon" + top="1" + scale_image="true" + visible="false" + width="308"/> + <icon + follows="all" + height="85" + image_name="ListItem_Select" + right="-2" + mouse_opaque="false" + name="selected_icon" + top="1" + scale_image="true" + visible="false" + width="308"/> + <texture_picker + allow_no_texture="true" + border_enabled="true" + fallback_image="default_land_picture.j2c" + enabled="false" + follows="left|top" + height="80" + layout="topleft" + left="10" + mouse_opaque="false" + name="picture" + tab_stop="false" + top="10" + top_pad="10" + width="90" /> + <text + follows="top|left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left="110" + name="name" + text_color="white" + top="9" + use_ellipses="true" + width="193" + word_wrap="false" /> + <expandable_text + follows="top|left|right" + font="SansSerifSmall" + height="55" + layout="topleft" + left="103" + name="description" + textbox.max_length="1024" + textbox.show_context_menu="false" + top_pad="0" + width="178" + word_wrap="true" /> + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" + layout="topleft" + left_pad="5" + right="-8" + name="info_chevron" + top_delta="24" + width="20" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml new file mode 100644 index 0000000000..5b3f0b17a9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> + +<panel + follows="left|right|top" + height="35" + layout="topleft" + left="0" + name="clothing_list_button_bar_panel" + top="0" + visible="true" + width="500"> + <button + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + label="Add +" + layout="topleft" + left="5" + name="add_btn" + top="5" + width="45" /> + <button + follows="top|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Shop" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + right="-5" + name="clothing_shop_btn" + top="5" + width="45" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml new file mode 100644 index 0000000000..cc0541e65c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="wearable_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="22" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="1" + visible="false" + width="380" /> + <icon + height="22" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="1" + visible="false" + width="380" /> + <button + name="btn_delete" + layout="topleft" + follows="top|left" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + top="3" + left="0" + height="18" + width="18" + tab_stop="false" + tool_tip="Remove from outfit" /> + <icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left_pad="3" + name="item_icon" + top="2" + width="16" /> + <text + follows="left|right" + height="16" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> + <button + name="btn_move_up" + layout="topleft" + follows="top|right" + image_overlay="UpArrow_Off" + top="1" + left="0" + height="23" + width="23" + tab_stop="false" /> + <button + name="btn_move_down" + layout="topleft" + follows="top|right" + image_overlay="DownArrow_Off" + top="1" + left_pad="3" + height="23" + width="23" + tab_stop="false" /> + <panel + background_visible="false" + name="btn_lock" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="You don't have permission to edit"> + <icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + </panel> + <panel + background_visible="false" + name="btn_edit_panel" + layout="topleft" + follows="top|right" + top="0" + left_pad="3" + height="23" + width="26" + tab_stop="false"> + <button + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="1" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Edit this wearable"/> + </panel> + <icon + follows="left|right|top" + height="3" + image_name="Wearables_Divider" + layout="bottomleft" + left="0" + name="wearable_type_separator_icon" + top="0" + visible="false" + width="380"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml new file mode 100644 index 0000000000..f438e3d42d --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="DkGray" + border="false" + follows="all" + height="200" + left="0" + name="cof_wearables" + width="311"> + <accordion + fit_parent="true" + follows="all" + height="198" + layout="topleft" + left="0" + single_expansion="true" + top="0" + name="cof_wearables_accordion" + background_visible="true" + bg_alpha_color="DkGray2" + width="311"> + <accordion_tab + layout="topleft" + name="tab_clothing" + title="Clothing"> + <flat_list_view + allow_select="true" + follows="all" + height="10" + item_pad="3" + keep_selection_visible_on_reshape="true" + layout="topleft" + left="0" + multi_select="true" + name="list_clothing" + top="0" + width="311" /> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_attachments" + title="Attachments"> + <flat_list_view + allow_select="true" + follows="all" + height="10" + item_pad="3" + layout="topleft" + left="0" + keep_selection_visible_on_reshape="true" + multi_select="true" + name="list_attachments" + top="0" + width="311"> + <flat_list_view.no_items_text + value="No attachments worn" /> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_body_parts" + title="Body Parts"> + <flat_list_view + allow_select="true" + follows="all" + height="10" + item_pad="3" + keep_selection_visible_on_reshape="true" + layout="topleft" + left="0" + multi_select="true" + name="list_body_parts" + top="0" + width="311" /> + </accordion_tab> + </accordion> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml new file mode 100644 index 0000000000..de2ff0afc9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="deletable_wearable_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="22" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="1" + visible="false" + width="380" /> + <icon + height="22" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="1" + visible="false" + width="380" /> + <button + name="btn_delete" + layout="topleft" + follows="top|left" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + top="3" + left="0" + height="18" + width="18" + tab_stop="false" + tool_tip="Remove from outfit"/> + <icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left_pad="3" + name="item_icon" + top="2" + width="16" /> + <text + follows="left|right" + height="16" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> + <icon + follows="left|right|top" + height="3" + image_name="Wearables_Divider" + layout="bottomleft" + left="0" + name="wearable_type_separator_icon" + top="0" + visible="true" + width="380"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml new file mode 100644 index 0000000000..df459b4083 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="dummy_clothing_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="22" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="1" + visible="false" + width="380" /> + <icon + height="22" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="1" + visible="false" + width="380" /> + <icon + height="16" + color="0.75 0.75 0.75 1" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="20" + name="item_icon" + top="2" + width="16" /> + <text + follows="left|right" + height="16" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="LtGray_50" + top="4" + value="..." + width="359" /> + <panel + name="btn_add_panel" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="26" + tab_stop="false"> + <button + name="btn_add" + layout="topleft" + follows="top|right" + image_overlay="AddItem_Off" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Add more items of this type" /> + </panel> + <icon + follows="left|right|top" + height="3" + image_name="Wearables_Divider" + layout="bottomleft" + left="0" + name="wearable_type_separator_icon" + top="0" + visible="true" + width="380"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml new file mode 100644 index 0000000000..7bcd4962d2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_alpha_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="400" + left="10" + layout="topleft" + name="avatar_alpha_color_panel" + top="0" + width="313" > + <check_box + control_name="LowerAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left="5" + name="lower alpha texture invisible" + top="10" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Lower Alpha" + layout="topleft" + left_pad="5" + name="Lower Alpha" + tool_tip="Click to choose a picture" + top="10" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + + <check_box + control_name="UpperAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="20" + name="upper alpha texture invisible" + top="10" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Upper Alpha" + layout="topleft" + left_pad="5" + name="Upper Alpha" + tool_tip="Click to choose a picture" + top="10" + width="115"> + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + + <check_box + control_name="HeadAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left="5" + name="head alpha texture invisible" + top_pad="15" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Head Alpha" + layout="topleft" + left_pad="5" + name="Head Alpha" + tool_tip="Click to choose a picture" + top_delta="0" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + + <check_box + control_name="Eye AlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="20" + name="eye alpha texture invisible" + top_delta="0" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Eye Alpha" + layout="topleft" + left_pad="5" + name="Eye Alpha" + tool_tip="Click to choose a picture" + top_delta="0" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + + <check_box + control_name="HairAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left="5" + name="hair alpha texture invisible" + top_pad="15" + width="16" /> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Hair Alpha" + layout="topleft" + left="30" + name="Hair Alpha" + tool_tip="Click to choose a picture" + top_delta="0" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml new file mode 100644 index 0000000000..5934956559 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -0,0 +1,356 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bevel_style="in" + follows="left|top|right|bottom" + height="569" + label="Edit Classified" + layout="topleft" + left="0" + min_height="350" + name="panel_edit_classified" + help_topic="profile_edit_classified" + top="0" + width="333"> + <panel.string + name="location_notice"> + (will update after save) + </panel.string> + <string name="publish_label"> + Publish + </string> + <string name="save_label"> + Save + </string> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back_btn" + left="10" + tab_stop="false" + top="2" + width="30" /> + <text + type="string" + length="1" + follows="top" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="4" + name="title" + text_color="LtGray" + top="0" + width="250"> + Edit Classified + </text> + <scroll_container + color="DkGray2" + follows="all" + height="502" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + reserve_scroll_corner="false" + opaque="true" + width="312"> + <panel + name="scroll_content_panel" + follows="left|top" + min_height="300" + layout="topleft" + top="0" + background_visible="false" + height="690" + left="0" + width="285"> + <panel + name="snapshot_panel" + layout="topleft" + follows="left|top|right" + height="197" + left="10" + top="10" + width="272"> + <texture_picker + fallback_image="default_land_picture.j2c" + follows="left|top|right" + height="197" + width="272" + layout="topleft" + top="0" + left="0" + name="classified_snapshot" /> + <icon + height="197" + image_name="spacer24.tga" + layout="topleft" + name="edit_icon" + label="" + tool_tip="Click to select an image" + top="0" + left="0" + width="272" /> + </panel> + <text + type="string" + length="1" + follows="left|top" + height="15" + font="SansSerifSmall" + font.style="BOLD" + layout="topleft" + left="10" + top="215" + name="Name:" + text_color="white" + width="280"> + Title: + </text> + <line_editor + follows="left|top|right" + font="SansSerif" + height="20" + layout="topleft" + left="10" + top_pad="2" + max_length="30" + name="classified_name" + prevalidate_callback="ascii" + text_color="black" + width="273" /> + <text + type="string" + length="1" + follows="left|top" + height="15" + font="SansSerifSmall" + font.style="BOLD" + layout="topleft" + left="10" + top_pad="20" + name="description_label" + text_color="white" + width="280"> + Description: + </text> + <text_editor + follows="left|top|right" + height="100" + width="273" + hide_scrollbar="false" + layout="topleft" + left="10" + top_pad="2" + max_length="64" + name="classified_desc" + text_color="black" + word_wrap="true" /> + <text + type="string" + length="1" + font="SansSerifSmall" + font.style="BOLD" + follows="left|top" + height="15" + layout="topleft" + left="10" + name="location_label" + text_color="white" + top_pad="20" + width="280"> + Location: + </text> + <text + type="string" + length="1" + follows="left|top" + height="30" + layout="topleft" + left="10" + name="classified_location" + right="-10" + top_pad="2" + width="280" + word_wrap="true"> + loading... + </text> + <button + follows="left|top" + height="23" + label="Set to Current Location" + layout="topleft" + left="10" + top_pad="5" + name="set_to_curr_location_btn" + width="200" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="category_label" + text_color="white" + top_pad="15" + value="Category:" + width="250" /> + <combo_box + follows="left|top" + height="23" + label="" + left="10" + name="category" + top_pad="5" + width="156" /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="content_type_label" + text_color="white" + top_pad="15" + value="Content type:" + width="250" /> + <icons_combo_box + follows="left|top" + height="23" + label="General Content" + layout="topleft" + left="10" + name="content_type" + top_pad="5" + width="156"> + <icons_combo_box.drop_down_button + image_overlay="Parcel_PG_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item + label="Moderate Content" + name="mature_ci" + value="Mature"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item + label="General Content" + name="pg_ci" + value="PG"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> + <check_box + height="16" + label="Auto renew each week" + layout="topleft" + left="10" + name="auto_renew" + top_pad="15" + width="250" /> + <text + follows="left|top" + height="10" + layout="topleft" + left="10" + name="price_for_listing_label" + text_color="white" + top_pad="15" + value="Price for listing:" + width="250" /> + <spinner + decimal_digits="0" + follows="left|top" + halign="left" + height="23" + increment="1" + label_width="20" + label="L$" + v_pad="10" + layout="topleft" + left="10" + value="50" + min_val="50" + max_val="99999" + name="price_for_listing" + top_pad="5" + tool_tip="Price for listing." + width="105" /> + </panel> + </scroll_container> + <panel + follows="left|right|bottom" + height="23" + label="bottom_panel" + layout="topleft" + left="8" + name="bottom_panel" + top_pad="5" + width="303"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_panel_ls" + left="1" + orientation="horizontal" + top_pad="0" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="save_changes_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="[LABEL]" + layout="topleft" + name="save_changes_btn" + left="1" + top="0" + width="155" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="157"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + left="1" + top="0" + width="156" /> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml new file mode 100644 index 0000000000..f173a2f3cb --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_eyes_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_eye_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Iris" + layout="topleft" + left="10" + name="Iris" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="eyes_main_tab" + title="Eyes"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="eyes_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml new file mode 100644 index 0000000000..a490f27b9f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_gloves_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_gloves_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="gloves_main_tab" + title="Gloves"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="gloves_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml new file mode 100644 index 0000000000..6bb5d2fa9b --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_hair_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_hair_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Texture" + layout="topleft" + left="10" + name="Texture" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="hair_color_tab" + title="Color"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="hair_color_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="hair_style_tab" + title="Style"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="hair_style_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="hair_eyebrows_tab" + title="Eyebrows"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="hair_eyebrows_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="hair_facial_tab" + title="Facial"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="hair_facial_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml new file mode 100644 index 0000000000..929cdffb3d --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_jacket_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_jacket_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Fabric" + layout="topleft" + left="25" + name="Upper Fabric" + tool_tip="Click to choose a picture" + top="10" + width="74" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Fabric" + layout="topleft" + left_pad="20" + name="Lower Fabric" + tool_tip="Click to choose a picture" + top="10" + width="74" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="74" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="jacket_main_tab" + title="Jacket"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="jacket_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml new file mode 100644 index 0000000000..f22cf983aa --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_pants_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_pants_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="pants_main_tab" + title="Pants"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="pants_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 967cf2f539..c4b831b71c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -2,54 +2,100 @@ <panel background_visible="true" bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" - height="640" + follows="left|top|right|bottom" + height="569" label="Edit Pick" layout="topleft" left="0" + min_height="350" name="panel_edit_pick" + help_topic="profile_edit_pick" top="0" - width="355"> - <text + width="333"> + <panel.string + name="location_notice"> + (will update after save) + </panel.string> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back_btn" + left="10" + tab_stop="false" + top="2" + width="30" /> + <text type="string" length="1" follows="top" font="SansSerifHugeBold" - height="15" + height="26" layout="topleft" - left="10" + left_pad="4" name="title" - text_color="white" - top="0" - width="150"> + text_color="LtGray" + top="2" + width="250"> Edit Pick </text> + <scroll_container + color="DkGray2" + follows="all" + height="502" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + opaque="true" + width="312"> <panel - background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" - follows="left|right|top|bottom" - height="570" + name="scroll_content_panel" + follows="left|top|right" + min_height="300" layout="topleft" - left="10" - right="-10" - top="30"> - <texture_picker - follows="left|top|right" - height="150" - layout="topleft" - left="10" - name="pick_snapshot" - right="-10" - top="10" /> + top="0" + background_visible="false" + height="500" + left="0" + width="285"> + <texture_picker + fallback_image="default_land_picture.j2c" + follows="left|top|right" + height="197" + width="272" + layout="topleft" + no_commit_on_selection="true" + top="10" + left="11" + name="pick_snapshot" /> + <icon + height="197" + image_name="spacer24.tga" + layout="topleft" + name="edit_icon" + label="" + tool_tip="Click to select an image" + top="10" + left="11" + width="286" /> <text type="string" length="1" - follows="left|top" - height="16" + follows="left|top|right" + height="15" + font="SansSerifSmall" + font.style="BOLD" layout="topleft" left="10" - name="Name:"> - Name: + top="215" + name="Name:" + text_color="white" + width="280"> + Title: </text> <line_editor follows="left|top|right" @@ -57,91 +103,137 @@ height="20" layout="topleft" left="10" + top_pad="2" + max_length="63" name="pick_name" - right="-10" - width="290" /> + text_color="black" + width="273" /> <text type="string" length="1" - follows="left|top" - height="30" + follows="left|top|right" + height="15" + font="SansSerifSmall" + font.style="BOLD" layout="topleft" left="10" + top_pad="20" name="description_label" - v_pad="15" - valign="center"> + text_color="white" + width="280"> Description: </text> <text_editor follows="left|top|right" height="100" + width="273" + hide_scrollbar="false" layout="topleft" left="10" + top_pad="2" max_length="1023" name="pick_desc" - right="-10" + text_color="black" word_wrap="true" /> <text type="string" length="1" - follows="left|top" - height="20" + font="SansSerifSmall" + font.style="BOLD" + follows="left|top|right" + height="15" layout="topleft" left="10" - name="description_label" - v_pad="15" - valign="bottom"> + name="location_label" + text_color="white" + top_pad="20" + 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" - v_pad="10" - valign="center" + top_pad="2" + width="280" word_wrap="true"> loading... </text> <button follows="left|top" - height="20" + height="23" label="Set to Current Location" layout="topleft" - left="10" + left="8" + top_pad="0" name="set_to_curr_location_btn" width="200" /> </panel> + </scroll_container> <panel - follows="right|bottom" - height="25" + follows="left|right|bottom" + height="23" label="bottom_panel" layout="topleft" - left="5" + left="8" name="bottom_panel" - top="605" - width="345"> - <button - follows="bottom|left" - height="20" - label="Save Changes" - layout="topleft" - name="save_changes_btn" - right="-120" - top="5" - width="130" /> - <button - follows="bottom|left" - height="20" - label="Cancel" - layout="topleft" - name="cancel_btn" - right="-10" - top="5" - width="90" /> + top_pad="5" + width="303"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="2" + orientation="horizontal" + top_pad="0" + width="303"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="topleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="150"> + <button + follows="bottom|left|right" + height="23" + label="Save Pick" + layout="topleft" + name="save_changes_btn" + top="0" + left="1" + width="149" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="topleft" + left_pad="4" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="150"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + top="0" + left="1" + width="149" /> + </layout_panel> + </layout_stack> + </panel> </panel> 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 e787d03eca..6781a76120 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -1,187 +1,222 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - class="edit_profile_panel" background_visible="true" - bevel_style="in" - bg_alpha_color="0.3 0.3 0.3 1" - follows="left|top|right|bottom" - height="690" + class="edit_profile_panel" + follows="all" + height="535" label="Profile Edit" layout="topleft" - left="10" - mouse_opaque="true" + left="0" name="edit_profile_panel" - top="10" - width="355"> - <text - top="0" - left="9" - height="20" - follows="left|top" - font="SansSerifHugeBold" + top="0" + width="313"> + <string + name="CaptionTextAcctInfo"> + [ACCTTYPE] +[PAYMENTINFO] [AGEVERIFICATION] + </string> + <string + name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <string + name="AcctTypeResident" + value="Resident" /> + <string + name="AcctTypeTrial" + value="Trial" /> + <string + name="AcctTypeCharterMember" + value="Charter Member" /> + <string + name="AcctTypeEmployee" + value="Linden Lab Employee" /> + <string + name="PaymentInfoUsed" + value="Payment Info Used" /> + <string + name="PaymentInfoOnFile" + value="Payment Info On File" /> + <string + name="NoPaymentInfoOnFile" + value="No Payment Info On File" /> + <string + name="AgeVerified" + value="Age-verified" /> + <string + name="NotAgeVerified" + value="Not Age-verified" /> + <string + name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=en + </string> + <string + name="my_account_link_url"> + http://secondlife.com/my + </string> + <string + name="no_partner_text" + value="None" /> + <scroll_container + color="DkGray2" + follows="all" + height="494" + min_height="300" layout="topleft" - name="title_text" - text_color="white" - width="350"> - Edit Profile - </text> - <panel - background_visible="true" - bg_alpha_color="0.6 0.6 0.6 1" - follows="left|top|right|bottom" - height="620" - layout="topleft" - left="9" - name="data_panel" - top_pad="10" - width="337"> - <text - top_pad="5" - left="9" - height="20" - follows="left|top" - font="SansSerifBigBold" - layout="topleft" - name="name_text" - text_color="white" - width="350"> - [FIRST] [LAST] - </text> + left="8" + width="292" + name="profile_scroll" + reserve_scroll_corner="true" + opaque="true" + top="10"> <panel - follows="left|top" - height="120" - layout="topleft" - left="9" + name="scroll_content_panel" + follows="left|top|right" + layout="topleft" + top="0" + height="494" + min_height="300" + left="0" + width="292"> + <panel + name="data_panel" + follows="left|top|right" + layout="topleft" + top="0" + height="494" + min_height="300" + left="0" + width="292"> + <panel name="lifes_images_panel" - top_pad="10" - width="250"> - <panel - height="120" - layout="topleft" - left="0" - name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="first_life_photo_title_text" - text_color="white" - top="0" - width="125"> - Second Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="2nd_life_pic" - top_pad="5" - width="105" /> + follows="left|top|right" + height="244" + layout="topleft" + top="0" + left="0" + width="292"> + <panel + follows="left|top" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="282"> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left="0" + top="10" + name="second_life_photo_title_text" + text_color="white" + value="[SECOND_LIFE]:" + width="100" /> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="default_profile_picture.j2c" + follows="top|left" + height="124" + layout="topleft" + left="1" + name="2nd_life_pic" + top_pad="0" + width="102" /> </panel> - <panel - height="120" + <icon + height="102" + image_name="spacer24.tga" layout="topleft" - left_pad="0" - name="first_life_image_panel" - top="0" - width="125"> - <text - type="string" - length="1" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="second_life_photo_title_text" - text_color="white" - top="0" - width="125"> - First Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="1st_life_pic" - top_pad="5" - width="105" /> - </panel> + name="2nd_life_edit_icon" + label="" + left="11" + top_pad="-92" + tool_tip="Click to select an image" + width="102" /> </panel> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_sl_descr_text" - text_color="white" - top_pad="10" - width="290"> - Second Life description: - </text> <text_editor type="string" length="1" follows="left|top|right" - font="SansSerif" - height="45" + font="SansSerifSmall" + height="102" layout="topleft" - left="9" + left="123" + top="25" + max_length="511" name="sl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + width="157" word_wrap="true"> </text_editor> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_fl_descr_text" - text_color="white" - top_pad="10" - width="290"> - First Life description: - </text> - <text_editor + <panel + follows="left|top" + height="117" + layout="topleft" + top_pad="5" + left="10" + name="first_life_image_panel" + width="285"> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left="0" + top_pad="10" + name="real_world_photo_title_text" + text_color="white" + value="Real World:" + width="100" /> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="Generic_Person_Large" + follows="top|left" + height="124" + layout="topleft" + left="1" + name="real_world_pic" + top_pad="0" + width="102" /> + </panel> + <icon + height="102" + image_name="spacer24.tga" + layout="topleft" + name="real_world_edit_icon" + label="" + left="11" + top_pad="-92" + tool_tip="Click to select an image" + width="102" /> + <text_editor type="string" length="1" follows="left|top|right" - font="SansSerif" - height="45" + font="SansSerifSmall" + height="102" layout="topleft" - left="9" + left="123" + max_length="254" + top="157" name="fl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" + width="157" word_wrap="true"> </text_editor> <text type="string" length="1" follows="left|top" - font="SansSerifBold" + font="SansSerifSmall" + font.style="BOLD" height="15" layout="topleft" - left="9" + left="10" name="title_homepage_text" text_color="white" top_pad="10" @@ -189,55 +224,164 @@ Homepage: </text> <line_editor - type="string" - length="1" follows="left|top|right" - font="SansSerif" - font.style="UNDERLINE" - height="15" + font="SansSerifSmall" + height="20" layout="topleft" - left="9" + left="10" + top_pad="0" + value="http://" name="homepage_edit" - text_color="0.2 0.2 1 1" - width="290"> - TODO + width="272"> </line_editor> <check_box follows="left|top" - label="Show me in Search results" + font="SansSerifSmall" + label="Show me in Search results" layout="topleft" - left="9" + left="8" name="show_in_search_checkbox" - height="16" - top_pad="10" - width="250"/> + height="15" + label_text.text_color="white" + top_pad="12" + width="100" /> + <text + follows="left|top" + font="SansSerifSmall" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_acc_status_text" + text_color="white" + top_pad="10" + value="My Account:" + width="100" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top|right" + h_pad="0" + height="28" + layout="topleft" + left="10" + name="acc_status_text" + read_only="true" + top_pad="5" + v_pad="0" + value="Resident. No payment info on file." + width="200" + word_wrap="true" /> + <text + type="string" + follows="left|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left="10" + name="my_account_link" + value="[[URL] Go to My Dashboard]" + width="200" /> + <text + follows="left|top" + font="SansSerifSmall" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_partner_text" + text_color="white" + top_pad="10" + value="My Partner:" + width="150" /> + <panel + follows="left|top|right" + height="15" + layout="topleft" + left="10" + name="partner_data_panel" + width="200"> + <name_box + follows="left|top|right" + height="30" + initial_value="(retrieving)" + layout="topleft" + left="0" + link="true" + name="partner_text" + top="0" + width="200" + word_wrap="true" /> + </panel> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="partner_edit_link" + value="[[URL] Edit]" + width="70" /> + </panel> </panel> - <panel - follows="bottom|right" - height="30" - left="96" + </scroll_container> + <panel + follows="bottom|left|right" + height="28" + left="0" name="profile_me_buttons_panel" - top_pad="8" - width="250"> + top_pad="0" + width="313"> + + <layout_stack + follows="bottom|left|right" + height="28" + layout="topleft" + name="bottom_panel_ls" + left="7" + orientation="horizontal" + top_pad="0" + width="295"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + name="save_changes_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="153"> <button - follows="bottom|right" - font="SansSerifSmallBold" - height="25" + follows="bottom|left|right" + height="23" label="Save Changes" layout="topleft" - left="0" + left="1" name="save_btn" - top="0" - width="130" /> + top="0" + width="152" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="154"> <button - follows="bottom|right" - font="SansSerifSmallBold" - height="25" + follows="bottom|left|right" + height="23" label="Cancel" layout="topleft" - right="-1" + left="1" name="cancel_btn" - top_delta="0" - width="105" /> + top="0" + width="153" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml new file mode 100644 index 0000000000..d295f5fe4a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shape_panel" + top_pad="10" + width="333" > + <string name="meters">Meters</string> + <string name="feet">Feet</string> + <string name="height">Height:</string> + <string name="heigth_label_color" translate="false">White_50</string> + <string name="heigth_value_label_color" translate="false">White</string> + <text + follows="top|left|right" + font="SansSerifSmallBold" + halign="right" + height="12" + layout="topleft" + left="0" + name="avatar_height" + top="0" + width="310"> + </text> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="388" + label="Shirt" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="0" + width="313"> + <accordion + layout="topleft" + follows="all" + height ="388" + left="0" + name="wearable_accordion" + top="0" + single_expansion="true" + fit_parent="true" + width="313"> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_body_tab" + fit_panel="false" + title="Body"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + height="300" + name="shape_body_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + fit_panel="false" + name="shape_head_tab" + title="Head"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="10" + name="shape_head_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + fit_panel="false" + name="shape_eyes_tab" + title="Eyes"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_eyes_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + fit_panel="false" + name="shape_ears_tab" + title="Ears"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_ears_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_nose_tab" + fit_panel="false" + title="Nose"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_nose_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_mouth_tab" + fit_panel="false" + title="Mouth"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_mouth_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_chin_tab" + fit_panel="false" + title="Chin"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_chin_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_torso_tab" + fit_panel="false" + title="Torso"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_torso_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + min_height="150" + name="shape_legs_tab" + fit_panel="false" + title="Legs"> + <scrolling_panel_list + layout="topleft" + follows="all" + left="0" + name="shape_legs_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml new file mode 100644 index 0000000000..85823073b5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shirt_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_shirt_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="shirt_main_tab" + title="Shirt"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="shirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml new file mode 100644 index 0000000000..b26fde68f1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shoes_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_shoes_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="shoes_main_tab" + title="Shoes"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="shoes_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml new file mode 100644 index 0000000000..45591ba2ad --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skin_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_skin_color_panel" + top="0" + width="313" > + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Head Tattoos" + layout="topleft" + left="25" + name="Head Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Upper Tattoos" + layout="topleft" + left_pad="20" + name="Upper Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <texture_picker + allow_no_texture="true" + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Lower Tattoos" + layout="topleft" + left_pad="20" + name="Lower Tattoos" + tool_tip="Click to choose a picture" + top="10" + width="74" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + layout="topleft" + fit_parent="true" + follows="all" + height ="300" + left="0" + name="wearable_accordion" + top="0" + single_expansion="true" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="skin_color_tab" + title="Skin Color"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="skin_color_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="skin_face_tab" + title="Face Detail"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="skin_face_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="skin_makeup_tab" + title="Makeup"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="skin_makeup_param_list" + top="0" + width="303" /> + </accordion_tab> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="skin_body_tab" + title="Body Detail"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="skin_body_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml new file mode 100644 index 0000000000..bb8e0dca07 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skirt_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_skirt_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="skirt_main_tab" + title="Skirt"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="skirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml new file mode 100644 index 0000000000..d813d94d93 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_socks_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_socks_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="socks_main_tab" + title="Socks"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="socks_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml new file mode 100644 index 0000000000..23a08344ea --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_tattoo_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="400" + left="10" + layout="topleft" + name="avatar_tattoo_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Head Tattoo" + layout="topleft" + left="20" + name="Head Tattoo" + tool_tip="Click to choose a picture" + top="10" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Upper Tattoo" + layout="topleft" + left_pad="30" + name="Upper Tattoo" + tool_tip="Click to choose a picture" + top="10" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="115" + label="Lower Tattoo" + layout="topleft" + left="20" + name="Lower Tattoo" + tool_tip="Click to choose a picture" + top_pad="10" + width="115" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="115" + label="Color/Tint" + layout="topleft" + left_pad="30" + name="Color/Tint" + tool_tip="Click to open color picker" + top_delta="0" + width="115" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml new file mode 100644 index 0000000000..19225e9757 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_underpants_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_underpants_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open color picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="underpants_main_tab" + title="Underpants"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="underpants_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml new file mode 100644 index 0000000000..720a55dcc2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + background_visible="true" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_undershirt_panel" + top_pad="10" + width="333" > + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="90" + left="10" + layout="topleft" + name="avatar_undershirt_color_panel" + top="0" + width="313" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" > + <texture_picker.commit_callback + function="TexturePicker.Commit" /> + </texture_picker> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="20" + name="Color/Tint" + tool_tip="Click to open Color Picker" + top="10" + width="64" > + <color_swatch.commit_callback + function="ColorSwatch.Commit" /> + </color_swatch> + </panel> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="300" + layout="topleft" + left="10" + name="accordion_panel" + top_pad="10" + width="313"> + <accordion + fit_parent="true" + follows="all" + height ="300" + layout="topleft" + left="0" + name="wearable_accordion" + single_expansion="true" + top="0" + width="313"> + <accordion_tab + layout="topleft" + fit_panel="false" + min_height="150" + name="undershirt_main_tab" + title="Undershirt"> + <scrolling_panel_list + follows="all" + layout="topleft" + left="0" + name="undershirt_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> + </panel> +</panel> + diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml new file mode 100644 index 0000000000..95c1c822b8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -0,0 +1,472 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bevel_style="in" + follows="all" + height="570" + help_topic="edit_wearable" + label="Wearable" + layout="topleft" + left="0" + name="panel_edit_wearable" + top="0" + width="333"> + <string + name="edit_shape_title"> + Editing Shape + </string> + <string + name="edit_skin_title"> + Editing Skin + </string> + <string + name="edit_hair_title"> + Editing Hair + </string> + <string + name="edit_eyes_title"> + Editing Eyes + </string> + <string + name="edit_shirt_title"> + Editing Shirt + </string> + <string + name="edit_pants_title"> + Editing Pants + </string> + <string + name="edit_shoes_title"> + Editing Shoes + </string> + <string + name="edit_socks_title"> + Editing Socks + </string> + <string + name="edit_jacket_title"> + Editing Jacket + </string> + <string + name="edit_skirt_title"> + Editing Skirt + </string> + <string + name="edit_gloves_title"> + Editing Gloves + </string> + <string + name="edit_undershirt_title"> + Editing Undershirt + </string> + <string + name="edit_underpants_title"> + Editing Underpants + </string> + <string + name="edit_alpha_title"> + Editing Alpha Mask + </string> + <string + name="edit_tattoo_title"> + Editing Tattoo + </string> + <string + name="shape_desc_text"> + Shape: + </string> + <string + name="skin_desc_text"> + Skin: + </string> + <string + name="hair_desc_text"> + Hair: + </string> + <string + name="eyes_desc_text"> + Eyes: + </string> + <string + name="shirt_desc_text"> + Shirt: + </string> + <string + name="pants_desc_text"> + Pants: + </string> + <string + name="shoes_desc_text"> + Shoes: + </string> + <string + name="socks_desc_text"> + Socks: + </string> + <string + name="jacket_desc_text"> + Jacket: + </string> + <string + name="skirt_desc_text"> + Skirt: + </string> + <string + name="gloves_desc_text"> + Gloves: + </string> + <string + name="undershirt_desc_text"> + Undershirt: + </string> + <string + name="underpants_desc_text"> + Underpants: + </string> + <string + name="alpha_desc_text"> + Alpha Mask: + </string> + <string + name="tattoo_desc_text"> + Tattoo: + </string> + <!-- Default width of the button should be to show it without label. + Button will be extedned in code to show whole label when wearable is being changed. + --> + <labeled_back_button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + label="Save" + left="11" + name="back_btn" + pad_left="24" + tool_tip="Return to Edit Outfit" + top="3" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="22" + layout="topleft" + left_pad="8" + name="edit_wearable_title" + text_color="white" + top="3" + value="Editing Shape" + use_ellipses="true" + width="274" /> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + border="false" + follows="top|left|right" + height="60" + label="Shirt" + layout="topleft" + left="10" + name="wearable_type_panel" + top_pad="10" + width="313"> + <text + follows="top|left|right" + font="SansSerifSmallBold" + height="16" + layout="topleft" + left="10" + name="description_text" + text_color="white" + top="10" + value="Shape:" + width="150" /> + <radio_group + control_name="AvatarSex" + follows="top|right" + height="20" + layout="topleft" + left="210" + name="sex_radio" + top="5" + width="110"> + <radio_item + follows="all" + height="16" + label="" + layout="topleft" + left="0" + name="sex_male" + tool_tip="Male" + value="1" + width="40" /> + <radio_item + follows="all" + height="16" + label="" + layout="topleft" + left_pad="10" + name="sex_female" + tool_tip="Female" + value="0" + width="40"/> + </radio_group> + <!-- graphical labels for the radio buttons above --> + <icon + follows="top|right" + height="16" + image_name="icons/Male.png" + layout="topleft" + left="230" + name="male_icon" + tool_tip="Male" + top="7" + width="16" /> + <icon + follows="top|right" + height="16" + image_name="icons/Female.png" + layout="topleft" + left="280" + name="female_icon" + tool_tip="Female" + top="7" + width="16" /> + <line_editor + follows="all" + height="23" + layout="topleft" + left="10" + max_length="63" + name="description" + prevalidate_callback="ascii" + select_on_focus="true" + text_color="black" + top_pad="3" + width="290" /> + </panel> + <panel + follows="all" + height="433" + layout="topleft" + left="0" + name="edit_subpanel_container" + top_pad="2" + width="333"> + <!-- the shape editing panel is taller than the others + because it also displays avatar height --> + <panel + filename="panel_edit_shape.xml" + follows="all" + height="433" + layout="topleft" + left="0" + name="edit_shape_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skin.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_skin_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_hair.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_hair_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_eyes.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_eyes_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_shirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_shirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_pants.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_pants_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_shoes.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_shoes_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_socks.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_socks_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_jacket.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_jacket_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_skirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_skirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_gloves.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_gloves_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_undershirt.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_undershirt_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_underpants.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_underpants_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_alpha.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_alpha_panel" + top="8" + visible="false" + width="333" /> + <panel + filename="panel_edit_tattoo.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_tattoo_panel" + top="8" + visible="false" + width="333" /> + </panel> + <panel + follows="bottom|left|right" + height="23" + layout="topleft" + left="2" + name="button_panel" + top_pad="6" + width="333"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_panel_ls" + left="0" + orientation="horizontal" + top="0" + width="333"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_as_btn_lp" + user_resize="false" + auto_resize="true" + width="154"> + <button + follows="bottom|left|right" + height="23" + label="Save As" + layout="topleft" + left="1" + name="save_as_button" + top="0" + width="153" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + user_resize="false" + auto_resize="true" + width="152"> + <button + follows="bottom|left|right" + height="23" + label="Undo Changes" + layout="topleft" + left_pad="7" + name="revert_button" + width="152" /> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml deleted file mode 100644 index a151eed20f..0000000000 --- a/indra/newview/skins/default/xui/en/panel_friends.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="true" - follows="all" - height="347" - layout="topleft" - name="friends" - width="100"> - <panel.string - name="Multiple"> - Multiple friends... - </panel.string> - <scroll_list - bottom="337" - column_padding="0" - draw_heading="true" - follows="left|top|bottom|right" - layout="topleft" - left="10" - multi_select="true" - name="friend_list" - right="-100" - search_column="1" - tool_tip="Hold shift or control while clicking to select multiple friends" - top="10"> - <scroll_list.columns - image="ff_online_status_button.tga" - name="icon_online_status" - tool_tip="Online status" - width="20" /> - <scroll_list.columns - dynamicwidth="true" - label="Name" - name="friend_name" - tool_tip="Name" /> - <scroll_list.columns - image="ff_visible_online_button.tga" - name="icon_visible_online" - tool_tip="Friend can see when you're online" - width="20" /> - <scroll_list.columns - image="ff_visible_map_button.tga" - name="icon_visible_map" - tool_tip="Friend can locate you on the map" - width="20" /> - <scroll_list.columns - image="ff_edit_mine_button.tga" - name="icon_edit_mine" - tool_tip="Friend can edit, delete or take objects" - width="20" /> - <scroll_list.columns - image="ff_edit_theirs_button.tga" - name="icon_edit_theirs" - tool_tip="You can edit this friend's objects" - width="20" /> - <scroll_list.columns - name="friend_last_update_generation" - width="0" /> - </scroll_list> - <locate - bottom="7" - layout="topleft" - left="-90" /> - <button - follows="top|right" - height="22" - label="IM/Call" - layout="topleft" - left_pad="10" - name="im_btn" - tool_tip="Open Instant Message session" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Profile" - layout="topleft" - left_delta="0" - name="profile_btn" - tool_tip="Show picture, groups, and other information" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Teleport..." - layout="topleft" - left_delta="0" - name="offer_teleport_btn" - tool_tip="Offer this friend a teleport to your current location" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Pay..." - layout="topleft" - left_delta="0" - name="pay_btn" - tool_tip="Give Linden dollars (L$) to this friend" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Remove..." - layout="topleft" - left_delta="0" - name="remove_btn" - tool_tip="Remove this person from your friends list" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Add..." - layout="topleft" - left_delta="0" - name="add_btn" - tool_tip="Offer friendship to a resident" - top_pad="13" - width="80" /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml new file mode 100644 index 0000000000..eea92895f5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="40" + layout="topleft" + left="0" + name="panel_generic_tip" + top="0" + width="305"> + <text + follows="all" + font="SansSerif" + height="20" + layout="topleft" + left="10" + max_length="350" + name="message" + text_color="white" + top="10" + use_ellipses="true" + value="" + width="285" + wrap="true" /> +</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 new file mode 100644 index 0000000000..c1dc2aaaf7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + follows="all" + height="238" + name="panel_im_control_panel" + width="150"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="238" + layout="topleft" + left="5" + name="vertical_stack" + orientation="vertical" + top="0" + width="145"> + <layout_panel + auto_resize="true" + follows="top|left" + height="100" + layout="topleft" + min_height="0" + mouse_opaque="false" + width="145" + top="0" + name="speakers_list_panel" + user_resize="false"> + <avatar_list + color="DkGray2" + follows="all" + height="100" + ignore_online_status="true" + layout="topleft" + name="speakers_list" + opaque="false" + show_info_btn="true" + show_profile_btn="false" + show_speaking_indicator="false" + width="145" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="28" + layout="topleft" + min_height="28" + width="130" + name="group_info_btn_panel" + user_resize="false"> + <button + follows="left|right|bottom" + height="23" + label="Group Profile" + name="group_info_btn" + use_ellipses="true" + top="5" + width="130" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="28" + layout="topleft" + min_height="28" + width="130" + name="call_btn_panel" + user_resize="false"> + <button + follows="all" + height="23" + label="Call Group" + name="call_btn" + use_ellipses="true" + width="130" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="28" + layout="topleft" + min_height="28" + width="130" + name="end_call_btn_panel" + user_resize="false" + visible="false"> + <button + follows="all" + height="23" + label="Leave Call" + name="end_call_btn" + use_ellipses="true" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="28" + layout="topleft" + min_height="28" + width="130" + name="voice_ctrls_btn_panel" + user_resize="false" + visible="false"> + <button + follows="all" + height="23" + label="Open Voice Controls" + name="voice_ctrls_btn" + use_ellipses="true" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 10d10f60ff..2af1a84400 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -1,316 +1,270 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="all" - height="466" label="General" - layout="topleft" - left="1" - name="general_tab" - top="466" - width="418"> + height="604" + width="304" + class="panel_group_general" + name="general_tab"> <panel.string name="help_text"> - The General tab contains general information about -this group, a list of Owners and visible Members, -general Group Preferences and member options. + The General tab contains general information about this group, a list of members, general Group Preferences and member options. Hover your mouse over the options for more help. </panel.string> <panel.string name="group_info_unchanged"> - General group information has changed. + General group information has changed </panel.string> <panel.string name="incomplete_member_data_str"> Retrieving member data </panel.string> - <panel.string - name="confirm_group_create_str"> - Creating this group will cost L$100. -Are you really, really, REALLY sure you want to spend L$100 to create this group? -Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group's name will be unavailable for future use. - </panel.string> - <panel.string - name="group_join_btn"> - Join (L$[AMOUNT]) - </panel.string> - <button - follows="left|top" - height="16" - label="?" - label_selected="?" - layout="topleft" - left="391" - name="help_button" - top="8" - width="20" /> - <line_editor + <panel + name="group_info_top" + follows="top|left" + top="0" + left="0" + height="129" + width="304" + layout="topleft"> + <texture_picker + default_image_name="Generic_Group_Large" follows="left|top" - font="SansSerif" - halign="left" - height="16" - label="Type your new group name here" + height="110" + label="" layout="topleft" - left_delta="-384" - max_length="35" - name="group_name_editor" - top_delta="0" - width="300" /> + left="10" + name="insignia" + no_commit_on_selection="true" + tool_tip="Click to choose a picture" + top="5" + width="100" /> <text + font="SansSerifSmall" + text_color="White_50" + width="190" + follows="top|left" + layout="topleft" + mouse_opaque="false" type="string" - length="1" - follows="left|top" - font="SansSerifBig" height="16" - layout="topleft" - left_delta="0" - name="group_name" - top_delta="-4" - width="300"> - Type your new group name here - </text> - <text - type="string" length="1" - height="16" - layout="topleft" - left_delta="0" + left_pad="10" name="prepend_founded_by" - top_pad="4" - width="100"> - Founded by + top_delta="0"> + Founder: </text> <name_box follows="left|top" height="16" initial_value="(retrieving)" layout="topleft" - left_delta="63" + left_delta="0" + link="true" name="founder_name" - top_delta="0" - width="200" /> + top_pad="2" + use_ellipses="true" + width="190" /> <text + font="SansSerifMedium" + text_color="EmphasisColor" type="string" - length="1" + follows="left|top" height="16" layout="topleft" - name="group_charter_label" - right="410" - top="40" - width="265"> - Group Charter + left_delta="0" + name="join_cost_text" + top_pad="10" + visible="true" + width="190"> + Free </text> - <texture_picker + <button follows="left|top" - height="144" - label="Group Insignia" - layout="topleft" - left_delta="-138" - name="insignia" - tool_tip="Click to choose a picture" - top_delta="1" - width="128" /> + left_delta="0" + top_pad="6" + height="23" + label="JOIN NOW!" + name="btn_join" + visible="true" + width="120" /> + </panel> <text_editor type="string" - length="1" - follows="left|top" - halign="left" - height="160" - hide_scrollbar="true" + follows="left|top|right" + left="5" + height="80" layout="topleft" max_length="511" name="charter" - right="410" - top="55" - width="265" + top="105" + right="-1" + bg_readonly_color="DkGray2" + text_readonly_color="White" word_wrap="true"> - Group Charter + Group Charter </text_editor> - <button - follows="left|top" - height="22" - label="Join (L$0)" - label_selected="Join (L$0)" - layout="topleft" - left="7" - name="join_button" - top="193" - width="128" /> - <button - follows="left|top" - height="22" - label="Detailed View" - label_selected="Detailed View" - layout="topleft" - left_delta="0" - name="info_button" - top_delta="0" - width="128" /> - <text - type="string" - length="1" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="text_owners_and_visible_members" - top_pad="4" - width="160"> - Owners & Visible Members - </text> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="text_owners_are_shown_in_bold" - top_delta="16" - width="160"> - (Owners are shown in bold) - </text> <name_list column_padding="0" draw_heading="true" - follows="left|top" - heading_height="14" - height="80" + follows="left|top|right" + heading_height="23" + height="160" layout="topleft" - left_delta="0" + left="0" name="visible_members" - top_pad="8" - width="404"> + top_pad="2"> <name_list.columns - label="Member Name" + label="Member" name="name" - relative_width="0.45" /> + relative_width="0.4" /> <name_list.columns label="Title" name="title" - relative_width="0.3" /> + relative_width="0.4" /> <name_list.columns - label="Last Login" - name="online" - relative_width="0.25" /> - </name_list> - <text - type="string" - length="1" - bottom_delta="18" - font="SansSerif" - layout="topleft" - name="text_group_preferences"> - Group Preferences - </text> - <panel - background_opaque="true" - bevel_style="in" - border="true" - follows="left|top" - height="96" - layout="topleft" - left_delta="0" - name="preferences_container" - top_pad="8" - width="404"> + label="Status" + name="status" + relative_width="0.2" /> + </name_list> + <text + follows="left|top|right" + type="string" + height="12" + layout="left|top|right" + left="5" + text_color="EmphasisColor" + name="my_group_settngs_label" + top_pad="10" + width="300"> + Me + </text> + <text + follows="left|top|right" + type="string" + height="12" + layout="left|top|right" + left="10" + name="active_title_label" + top_pad="5" + width="300"> + My title: + </text> + <combo_box + follows="left|top|right" + height="23" + layout="topleft" + left="10" + right="-5" + name="active_title" + tool_tip="Sets the title that appears in your avatar's name tag when this group is active." + top_pad="2" /> <check_box height="16" - initial_value="true" - label="Show in search" + font="SansSerifSmall" + label="Receive group notices" layout="topleft" - left="4" - name="show_in_group_list" - tool_tip="Let people see this group in search results." - top="4" - width="95" /> + left="10" + name="receive_notices" + tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." + top_pad="5" + width="300" /> <check_box - follows="right|top" height="16" - label="Open enrollment" + label="Show in my profile" layout="topleft" - left_delta="0" + left="10" + name="list_groups_in_profile" + tool_tip="Sets whether you want to show this group in your profile" + top_pad="5" + width="295" /> + <panel + background_visible="false" + bevel_style="none" + border="false" + bg_alpha_color="FloaterUnfocusBorderColor" + follows="left|top|right" + height="140" + width="313" + layout="topleft" + left="0" + name="preferences_container" + top_pad="5"> + <text + follows="left|top|right" + type="string" + height="12" + layout="left|top|right" + left="5" + text_color="EmphasisColor" + name="group_settngs_label" + width="300"> + Group + </text> + <check_box + follows="right|top|left" + height="16" + label="Anyone can join" + layout="topleft" + left="10" name="open_enrollement" - tool_tip="Sets whether this group allows new members to join without being invited." - top_pad="2" - width="95" /> + tool_tip="Sets whether this group allows new members to join without being invited." + width="90" /> <check_box height="16" - label="Enrollment fee: L$" + label="Cost to join" layout="topleft" - left_delta="16" + left_delta="0" name="check_enrollment_fee" - tool_tip="Sets whether to require an enrollment fee to join the group." - top="40" - width="95" /> + tool_tip="Sets whether to require an enrollment fee to join the group" + top_pad="5" + width="300" /> <spinner decimal_digits="0" follows="left|top" halign="left" - height="16" + height="23" increment="1" - label_width="10" + label_width="15" + label="L$" layout="topleft" - left_pad="21" max_val="99999" + left="30" name="spin_enrollment_fee" - tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." - top_delta="-2" - width="65" /> + tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." + width="170" /> <combo_box - height="20" + follows="left|top" + height="23" layout="topleft" - left="6" + left="10" name="group_mature_check" - tool_tip="Sets whether your group information is considered mature." - top="64" - width="130"> - <combo_box.item - label="Select Mature -" - value="Select" /> + tool_tip="Sets whether your group contains information rated as Moderate" + top_pad="4" + width="190"> + <combo_item name="select_mature" value="Select"> + - Select maturity rating - + </combo_item> <combo_box.item - label="Mature Content" + label="Moderate Content" + name="mature" value="Mature" /> <combo_box.item - label="PG Content" + label="General Content" + name="pg" value="Not Mature" /> </combo_box> - <text - type="string" - length="1" - height="16" - layout="topleft" - left="225" - name="active_title_label" - top="4" - width="95"> - My Active Title - </text> - <combo_box - height="16" - layout="topleft" - left_delta="0" - name="active_title" - tool_tip="Sets the title that appears in your avatar's name tag when this group is active." - top_pad="6" - width="95" /> - <check_box - height="16" - label="Receive group notices" - layout="topleft" - left_delta="0" - name="receive_notices" - tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." - top_pad="9" - width="95" /> <check_box + follows="left|top" height="16" - label="List group in my profile" + initial_value="true" + label="Show in search" layout="topleft" - left_delta="0" - name="list_groups_in_profile" - tool_tip="Sets whether you want to list this group in your Profile" - top_pad="2" - width="95" /> + left="10" + name="show_in_group_list" + tool_tip="Let people see this group in search results" + top_pad="4" + width="300" /> + </panel> </panel> 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 new file mode 100644 index 0000000000..3ded5c6678 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel +background_visible="true" + follows="all" + height="570" + label="Group Profile" + layout="topleft" + min_height="350" + left="0" + top="20" + name="GroupInfo" + width="313"> + <panel.string + name="default_needs_apply_text"> + There are unsaved changes + </panel.string> + <panel.string + name="want_apply_text"> + Do you want to save these changes? + </panel.string> + <panel.string + name="group_join_btn"> + Join (L$[AMOUNT]) + </panel.string> + <panel.string + name="group_join_free"> + Free + </panel.string> + <panel + name="group_info_top" + follows="top|left" + top="0" + left="0" + height="29" + width="313" + layout="topleft"> + <button + follows="top|right" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back" + left="7" + tab_stop="false" + top="2" + width="30" /> + <text_editor + allow_scroll="false" + bg_visible="false" + read_only = "true" + layout="topleft" + name="group_name" + v_pad="0" + value="(Loading...)" + font="SansSerifHugeBold" + h_pad="0" + height="26" + left_pad="8" + text_color="LtGray" + top="1" + use_ellipses="true" + width="275" + follows="top|left|right" + word_wrap="false" + mouse_opaque="false"/> + <line_editor + follows="left|top" + font="SansSerif" + label="Type your new group name here" + layout="topleft" + left_delta="10" + max_length="35" + name="group_name_editor" + top_delta="5" + width="270" + height="20" + visible="false" /> + </panel> + <layout_stack + name="layout" + orientation="vertical" + follows="all" + left="8" + top_pad="0" + height="506" + width="292" + border_size="0"> + <layout_panel + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + name="group_accordions" + follows="all" + layout="topleft" + auto_resize="true" + height="513" + width="313"> + <accordion + left="0" + top="0" + single_expansion="true" + fit_parent="true" + follows="all" + layout="topleft" + name="groups_accordion" + height="513" + width="313"> + <accordion_tab + expanded="true" + layout="topleft" + name="group_general_tab" + title="General" + fit_panel="false"> + <panel + border="false" + class="panel_group_general" + filename="panel_group_general.xml" + layout="topleft" + left="0" + follows="left|top|right" + help_topic="group_general_tab" + name="group_general_tab_panel" + top="0" /> + </accordion_tab> + <accordion_tab + expanded="false" + layout="topleft" + name="group_roles_tab" + title="Roles" + fit_panel="false"> + <panel + border="false" + class="panel_group_roles" + filename="panel_group_roles.xml" + follows="left|top|right" + layout="topleft" + left="0" + name="group_roles_tab_panel" + top="0" /> + </accordion_tab> + <accordion_tab + expanded="false" + layout="topleft" + name="group_notices_tab" + title="Notices" + fit_panel="false"> + <panel + border="false" + class="panel_group_notices" + filename="panel_group_notices.xml" + follows="left|top|right" + layout="topleft" + left="0" + help_topic="group_notices_tab" + name="group_notices_tab_panel" + top="0" /> + </accordion_tab> + <accordion_tab + expanded="false" + layout="topleft" + name="group_land_tab" + title="Land/Assets" + fit_panel="false"> + <panel + border="false" + class="panel_group_land_money" + filename="panel_group_land_money.xml" + follows="left|top|right" + layout="topleft" + left="0" + name="group_land_tab_panel" + top="0" /> + </accordion_tab> + </accordion> + </layout_panel> + </layout_stack> + + <layout_stack + follows="bottom|left|right" + height="25" + layout="topleft" + name="button_row_ls" + left="6" + orientation="horizontal" + top_pad="5" + width="297"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="btn_refresh_lp" + user_resize="false" + auto_resize="false" + width="24"> + <button + follows="bottom|left|right" + height="23" + image_overlay="Refresh_Off" + layout="topleft" + left="1" + top="0" + name="btn_refresh" + width="23" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="btn_chat_lp" + user_resize="false" + auto_resize="true" + width="91"> + <button + follows="bottom|left|right" + label="Chat" + name="btn_chat" + left="1" + height="23" + top="0" + width="90" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="91"> + <button + follows="bottom|left|right" + left="1" + height="23" + name="btn_call" + label="Group Call" + layout="topleft" + tool_tip="Call this group" + top="0" + width="90" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="btn_apply_lp" + user_resize="false" + auto_resize="true" + width="91"> + <button + follows="bottom|left|right" + height="23" + label="Save" + label_selected="Save" + name="btn_apply" + left="1" + top="0" + width="90" /> + <button + follows="bottom|left|right" + height="23" + layout="topleft" + left="1" + top="0" + label="Create Group" + name="btn_create" + visible="true" + tool_tip="Create a new Group" + width="90" /> + </layout_panel> + </layout_stack> + +</panel> 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 43457ddd61..15a3191bdf 100644 --- a/indra/newview/skins/default/xui/en/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml @@ -15,6 +15,10 @@ name="loading"> (loading...) </panel.string> + <panel.string + name="already_in_group"> + Some Residents you chose are already in the group, and so were not sent an invitation. + </panel.string> <text type="string" length="1" @@ -22,14 +26,12 @@ 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 - font="SansSerifSmall" height="20" label="Open Resident Chooser" layout="topleft" @@ -45,17 +47,16 @@ 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 - font="SansSerifSmall" height="20" label="Remove Selected from List" 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 @@ -66,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> @@ -74,20 +76,18 @@ Resident Chooser' to start. layout="topleft" left_delta="0" name="role_name" - tool_tip="Choose from the list of Roles you are allowed to assign members to." + tool_tip="Choose from the list of Roles you are allowed to assign members to" top_delta="16" width="196" /> <button - font="SansSerifSmall" height="20" label="Send Invitations" layout="topleft" left="4" name="ok_button" top="356" - width="130" /> + width="135" /> <button - font="SansSerifSmall" height="20" label="Cancel" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 35691661f1..2e57c85d6f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -1,25 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="all" - height="470" + border="false" + height="500" label="Land & L$" layout="topleft" - left="1" + left="0" name="land_money_tab" - top="470" - width="418"> + top="0" + width="304"> <panel.string name="help_text"> - Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The Planning, Details, and Sales tabs provide information about the group's finances. + A warning appears until the Total Land in Use is less than or = to the Total Contribution. </panel.string> <panel.string name="cant_view_group_land_text"> - You do not have permission to view group owned land. + You don't have permission to view group owned land + </panel.string> + <panel.string + name="epmty_view_group_land_text"> + No entries </panel.string> <panel.string name="cant_view_group_accounting_text"> - You do not have permission to view the group's accounting information. + You don't have permission to view the group's accounting information. </panel.string> <panel.string name="loading_txt"> @@ -27,138 +30,134 @@ </panel.string> <panel.string name="land_contrib_error"> - Unable to set your land contribution. + Unable to set your land contribution </panel.string> - <button - height="16" - label="?" - layout="topleft" - left="391" - name="help_button" - top="8" - width="20" /> - <text + <!-- <text type="string" - length="1" follows="left|top" font="SansSerifBig" height="16" layout="topleft" - left_delta="-384" + left="10" name="group_land_heading" - top_delta="-4" - width="150"> + top_pad="10" + width="260"> Group Owned Land - </text> + </text> --> + <panel + name="layout_panel_landmoney" + follows="top|left|right" + left="0" + right="-1" + height="250" + width="313" + > <scroll_list draw_heading="true" - follows="top" - font="SansSerifSmall" - heading_height="14" - height="120" + follows="top|left|right" + height="130" layout="topleft" - left_delta="0" + left="0" + right="-1" + top="0" + sort_column="0" + sort_ascending="true" name="group_parcel_list" - top_pad="6" - width="404"> + width="313"> <scroll_list.columns - label="Parcel Name" + label="Parcel" name="name" - width="100" /> + width="47" /> <scroll_list.columns label="Region" name="location" - width="120" /> + width="47" /> <scroll_list.columns label="Type" name="type" - width="100" /> + width="47" /> <scroll_list.columns label="Area" name="area" - width="61" /> + width="47" /> <scroll_list.columns - label="" + label="Hidden" name="hidden" - width="-1" /> + width="47" /> </scroll_list> - <button - follows="top" - height="20" - label="Show on Map" - label_selected="Show on Map" - layout="topleft" - left="312" - name="map_button" - top="150" - width="100" - enabled="false" /> <text type="string" - length="1" follows="left|top" halign="right" height="16" layout="topleft" - left_delta="-305" + left="0" name="total_contributed_land_label" - top_delta="4" - width="120"> - Total Contribution: + width="130"> + Total contribution: </text> <text + text_color="EmphasisColor" type="string" - length="1" follows="left|top" height="16" layout="topleft" left_pad="5" name="total_contributed_land_value" top_delta="0" - width="100"> - [AREA] sq. meters + width="90"> + [AREA] m² </text> + <button + follows="top" + height="23" + label="Map" + label_selected="Map" + layout="topleft" + name="map_button" + top_delta="-4" + left_pad="0" + width="60" + enabled="false" /> <text type="string" - length="1" follows="left|top" halign="right" height="16" layout="topleft" - left="7" + left="0" name="total_land_in_use_label" - top="172" - width="120"> - Total Land In Use: + top_pad="0" + width="130"> + Total land in use: </text> <text + text_color="EmphasisColor" type="string" - length="1" follows="left|top" height="16" layout="topleft" left_pad="5" name="total_land_in_use_value" top_delta="0" - width="150"> - [AREA] sq. meters + width="120"> + [AREA] m² </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" layout="topleft" - left="7" + left="0" name="land_available_label" - top="190" - width="120"> - Land Available: + top_pad="0" + width="130"> + Land available: </text> <text + text_color="EmphasisColor" type="string" - length="1" follows="left|top" height="16" layout="topleft" @@ -166,208 +165,214 @@ name="land_available_value" top_delta="0" width="120"> - [AREA] sq. meters + [AREA] m² </text> <text type="string" - length="1" follows="left|top" halign="right" height="16" layout="topleft" - left="7" + left="0" name="your_contribution_label" - top="208" - width="120"> - Your Contribution: + top_pad="0" + width="130"> + Your contribution: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|top" - height="16" + height="19" layout="topleft" left_pad="5" max_length="10" name="your_contribution_line_editor" - top_delta="-2" - width="70" /> + top_delta="0" + width="80" /> <text type="string" - length="1" follows="left|top" height="16" layout="topleft" - left_pad="5" - name="your_contribution_max_value" + left_pad="3" + name="your_contribution_units" top_delta="2" - width="200"> - sq. meters ([AMOUNT] max) + width="40" + > + m² + </text> + <text + type="string" + follows="left|top" + halign="left" + height="16" + layout="topleft" + left="140" + name="your_contribution_max_value" + top_pad="2" + width="170"> + ([AMOUNT] max) </text> <icon height="16" - image_name="smicon_warn.tga" + image_name="Parcel_Exp_Color" layout="topleft" - left="9" + left="75" name="group_over_limit_icon" - top="235" - visible="false" - width="16" /> + color="Green" + top_pad="0" + visible="true" + width="18" /> <text + follows="left|top" type="string" - length="1" - height="16" + word_wrap="true" + height="20" layout="topleft" - left_pad="5" + left_pad="2" name="group_over_limit_text" - text_color="GroupOverTierColor" - top_delta="1" - width="400"> - Group members must contribute more land credits to support land in use. + text_color="ColorPaletteEntry29" + top_delta="0" + width="213"> + More land credits are needed to support land in use </text> <text type="string" - length="1" follows="left|top" font="SansSerifBig" height="16" layout="topleft" - left="12" + left="0" name="group_money_heading" - top="261" - width="150"> + text_color="EmphasisColor" + top_pad="-15" + width="100"> Group L$ </text> + </panel> <tab_container follows="all" - height="180" + height="230" + halign="center" layout="topleft" - left="6" + left="0" + right="-1" name="group_money_tab_container" tab_position="top" - top="286" - width="406"> + top_pad="2" + tab_min_width="90" + width="313"> <panel - border="true" - follows="left|top|right|bottom" - height="255" - label="Planning" + border="false" + follows="all" + label="PLANNING" layout="topleft" - left="1" + left="0" + help_topic="group_money_planning_tab" name="group_money_planning_tab" - top="5" - width="398"> + top="0" + width="313"> <text_editor + enabled="false" type="string" - length="1" - bg_readonly_color="0.784314 0.819608 0.8 1" follows="all" - font="Monospace" - height="150" + height="200" layout="topleft" - left="8" + left="0" max_length="4096" name="group_money_planning_text" - top="5" - width="382"> - Computing... + top="2" + width="313" + word_wrap="true"> + Loading... </text_editor> </panel> - <panel - border="true" + <panel + border="false" follows="all" - height="250" - label="Details" + label="DETAILS" layout="topleft" - left_delta="0" + left="0" + help_topic="group_money_details_tab" name="group_money_details_tab" - top_delta="163" - width="398"> - <text_editor + top="0" + width="313"> + <text_editor + enabled="false" type="string" - length="1" - bg_readonly_color="0.784314 0.819608 0.8 1" - follows="left|top" - font="Monospace" - height="125" + follows="all" + height="185" layout="topleft" - left="8" + left="0" max_length="4096" name="group_money_details_text" - top="7" - width="382"> - Computing... + top="2" + width="313" + word_wrap="true"> + Loading... </text_editor> <button - follows="left|top" - height="20" - label="< Earlier" - label_selected="< Earlier" - layout="topleft" - left="24" - name="earlier_details_button" - tool_tip="Go back in time" - top="136" - width="80" /> - <button - follows="left|top" - height="20" - label="Later >" - label_selected="Later >" - layout="topleft" - left_pad="190" - name="later_details_button" - tool_tip="Go forward in time" - top_delta="0" - width="80" /> + follows="left|top" + height="18" + image_overlay="Arrow_Left_Off" + layout="topleft" + name="earlier_details_button" + tool_tip="Back" + left="200" + top_pad="0" + width="25" /> + <button + follows="left|top" + height="18" + image_overlay="Arrow_Right_Off" + layout="topleft" + name="later_details_button" + tool_tip="Next" + left_pad="15" + width="25" /> </panel> - <panel - border="true" + <panel + border="false" follows="all" - height="164" - label="Sales" + label="SALES" layout="topleft" - left_delta="0" + left="0" + help_topic="group_money_sales_tab" name="group_money_sales_tab" - top_delta="-1" - width="398"> + top="0" + width="313"> <text_editor + enabled="false" type="string" - length="1" - bg_readonly_color="0.784314 0.819608 0.8 1" - follows="left|top" - font="Monospace" - height="125" + follows="all" + height="185" layout="topleft" - left="8" + left="0" max_length="4096" name="group_money_sales_text" - top="7" - width="382"> - Computing... + top="2" + width="313" + word_wrap="true"> + Loading... </text_editor> - <button - follows="left|top" - height="20" - label="< Earlier" - label_selected="< Earlier" - layout="topleft" - left="24" - name="earlier_sales_button" - tool_tip="Go back in time" - top="136" - width="80" /> - <button - follows="left|top" - height="20" - label="Later >" - label_selected="Later >" - layout="topleft" - left_pad="190" - name="later_sales_button" - tool_tip="Go forward in time" - top_delta="0" - width="80" /> + <button + follows="left|top" + height="18" + image_overlay="Arrow_Left_Off" + layout="topleft" + name="earlier_sales_button" + tool_tip="Back" + left="200" + top_pad="0" + width="25" /> + <button + follows="left|top" + height="18" + image_overlay="Arrow_Right_Off" + layout="topleft" + left_pad="15" + name="later_sales_button" + tool_tip="Next" + width="25" /> </panel> </tab_container> </panel> 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 new file mode 100644 index 0000000000..0b84ac03c5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="24" + layout="topleft" + left="0" + name="group_list_item" + top="0" + width="320"> + <icon + follows="top|right|left" + height="24" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="320" /> + <icon + height="24" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="320" /> + <icon + height="20" + image_name="Generic_Group" + name="group_icon" + mouse_opaque="true" + left="5" + top="2" + width="20" /> + <text + parse_urls="false" + follows="left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="group_name" + top="6" + use_ellipses="true" + value="Unknown" + width="242" /> + <button + follows="right" + height="16" + image_pressed="Info_Press" + image_unselected="Info_Over" + left_pad="3" + right="-31" + name="info_btn" + tab_stop="false" + top_delta="-2" + width="16" /> + <!--*TODO: Should only appear on rollover--> + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" + layout="topleft" + left_pad="5" + right="-3" + name="profile_btn" + tab_stop="false" + 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 345cc734e6..41f2b28004 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -1,166 +1,138 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="all" - height="466" + height="530" label="Notices" layout="topleft" - left="1" + left="0" name="notices_tab" - top="466" - width="418"> + top="0" + width="304"> <panel.string name="help_text"> - Notices are a quick way to communicate across a -group by broadcasting a message and delivering -an optionally attached item. Notices only go to -group members in Roles granted the ability to -receive Notices. You can turn off Notices on -the General tab. + Notices let you send a message and an optionally attached item. +Notices only go to group members in Roles with the ability to receive Notices. +You can turn off Notices on the General tab. </panel.string> <panel.string name="no_notices_text"> - There are no past notices. + There are no past notices </panel.string> - <button - height="16" - label="?" - label_selected="?" - layout="topleft" - left="391" - name="help_button" - top="8" - width="20" /> - <text - type="string" - length="1" - font="SansSerifBig" - height="16" - layout="topleft" - left_delta="-384" - name="lbl" - top_delta="-4" - width="436"> - Group Notices Archive - </text> <text + follows="left|top" type="string" - length="1" - height="16" + word_wrap="true" + height="24" + halign="left" layout="topleft" - left_delta="0" + text_color="White_50" + left="5" name="lbl2" - top_pad="4" - width="436"> - Notices are kept for 14 days. Click the notice below you wish to view. -Click the 'Refresh' button to check if new notices have been received. -Notice lists are limited to 200 notices per group on a daily basis. + right="-1" + top="5" + width="300"> + Notices are kept for 14 days. +Maximum 200 per group daily </text> <scroll_list + follows="left|top|right" column_padding="0" draw_heading="true" - heading_height="14" - height="109" + height="175" layout="topleft" - left_delta="0" + left="0" + right="-1" name="notice_list" - top_pad="28" - width="404"> + top_pad="0" + width="304"> <scroll_list.columns label="" name="icon" - width="16" /> + width="20" /> <scroll_list.columns label="Subject" name="subject" - width="171" /> + width="110" /> <scroll_list.columns label="From" name="from" - width="125" /> + width="100" /> <scroll_list.columns label="Date" name="date" - width="85" /> + width="60" /> <scroll_list.columns name="sort" width="-1" /> </scroll_list> <text + follows="left|top" type="string" - length="1" layout="topleft" name="notice_list_none_found" visible="false"> - None found. + None found </text> - <button - height="20" - label="Create New Notice" - label_selected="Create New Notice" + <button + follows="top|left" + height="23" + image_overlay="AddItem_Off" + image_overlay_alignment="left" + imgoverlay_label_space="-10" + label="New Notice" + layout="topleft" + left="5" + name="create_new_notice" + tool_tip="Create a new notice" + top_delta="0" + width="93" /> + <button + follows="top|left" + height="23" + image_overlay="Refresh_Off" layout="topleft" - left_delta="0" - name="create_new_notice" - top_delta="-2" - width="150" /> - <button - height="20" - label="Refresh" - label_selected="Refresh List" - layout="topleft" - left_pad="164" name="refresh_notices" + left="260" + tool_tip="Refresh list of notices" top_delta="0" - width="90" /> + width="23" /> <panel - follows="all" - height="268" + follows="left|top|right" + height="280" label="Create New Notice" layout="topleft" - left="1" + left="0" + right="-1" + top_pad="0" + visible="true" name="panel_create_new_notice" - top="198" - width="418"> + width="313"> <text + follows="left|top" type="string" - length="1" font="SansSerifBig" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top="2" - width="436"> + text_color="EmphasisColor" + top="5" + width="200"> Create a Notice </text> <text + follows="left|top" type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="lbl2" - top_pad="4" - width="436"> - You must enter a subject to send a notice. You can add a single -item to a notice by dragging it from your inventory to this -panel. Attached items must be copiable and transferrable, -and you can't send a folder. - </text> - <text - type="string" - length="1" - halign="right" + halign="left" height="16" layout="topleft" - left_delta="0" name="lbl3" - top_pad="47" - width="55"> + top_pad="10" + width="60"> Subject: </text> <line_editor + follows="left|top|right" border_style="line" border_thickness="1" height="16" @@ -168,211 +140,220 @@ and you can't send a folder. left_pad="3" max_length="63" name="create_subject" - top_delta="0" - width="264" /> + prevalidate_callback="ascii" + width="220" /> <text + follows="left|top" type="string" - length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top="103" - width="55"> + top_pad="5" + width="60"> Message: </text> <text_editor - height="120" - hide_scrollbar="true" + follows="left|top|right" + height="90" layout="topleft" left_pad="3" max_length="511" name="create_message" - top_delta="2" - width="346" + top_delta="0" + width="220" word_wrap="true" /> <text + follows="left|top" type="string" - length="1" - halign="right" - height="16" + halign="left" + height="14" layout="topleft" - left="7" + left="10" name="lbl5" - top="228" - width="55"> + width="200"> Attach: </text> <line_editor + follows="left|top|right" enabled="false" - height="16" + height="19" layout="topleft" - left_pad="4" - max_length="63" + max_length="90" mouse_opaque="false" name="create_inventory_name" - top_delta="2" - width="211" /> + top_pad="2" + width="285" /> + <text + text_color="EmphasisColor" + follows="left|top" + type="string" + halign="right" + height="34" + layout="topleft" + left="10" + name="string" + top_pad="15" + word_wrap="true" + width="150"> + Drag and drop item here to attach it: + </text> <icon - height="16" + height="72" + image_name="DropTarget" layout="topleft" - left_delta="0" - name="create_inv_icon" - top_delta="0" - width="16" /> + left_pad="10" + mouse_opaque="true" + name="drop_icon" + top_delta="-10" + width="72" /> <button - height="20" - label="Remove Attachment" - label_selected="Remove Attachment" + follows="left|top" + layout="topleft" + left="20" + top_delta="50" + height="23" + width="100" + name="open_inventory" + label="Inventory" + tool_tip="Open Inventory"> + <button.init_callback + function="Button.SetFloaterToggle" + parameter="inventory"/> + </button> + <button + follows="left|top" layout="topleft" - left_pad="197" + left="140" name="remove_attachment" - top_delta="-4" - width="135" /> + top_delta="0" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + image_disabled="TrashItem_Disabled" + tool_tip="Remove attachment from your notification" + width="18" /> <button - height="20" - label="Send Notice" - label_selected="Send Notice" + follows="left|top" + height="23" + label="Send" + label_selected="Send" layout="topleft" - left_delta="0" + right="-25" + top_pad="10" name="send_notice" - top_delta="20" - width="135" /> - <panel - bevel_style="in" - border="true" - height="76" - layout="topleft" - left="335" - name="drop_target2" - top="20" - width="76" /> - <icon - height="64" - image_name="icon_groupnoticeinventory.tga" - layout="topleft" - left_delta="5" - mouse_opaque="true" - name="drop_icon" - top="25" - width="64" /> - <group_drop_target - height="466" + width="100" /> + <group_drop_target + height="75" + top="160" + left="10" layout="topleft" - left="0" name="drop_target" - tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." - top="-198" - width="422" /> - </panel> + tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it." + width="280" /> + </panel> <panel - follows="all" - height="268" + follows="left|top|right" + height="280" label="View Past Notice" layout="topleft" - left_delta="0" + left="0" + right="-1" + visible="false" name="panel_view_past_notice" - top_delta="0" - width="418"> + top="230" + width="313"> <text type="string" - length="1" - font="SansSerifBig" + font="SansSerifMedium" height="16" layout="topleft" - left="7" + left="10" mouse_opaque="false" name="lbl" - top="2" - width="436"> + text_color="EmphasisColor" + top_pad="5" + width="265"> Archived Notice </text> <text type="string" - length="1" height="16" + word_wrap="true" layout="topleft" left_delta="0" name="lbl2" - top_pad="4" - width="436"> - To send a new notice, click the 'Create New Notice' button above. + top_pad="2" + width="265"> + To send a new notice, click the + button </text> <text type="string" - length="1" - halign="right" + halign="left" height="16" layout="topleft" left_delta="0" name="lbl3" - top_pad="24" + top_pad="15" visible="false" - width="55"> + width="60"> Subject: </text> <line_editor border_style="line" border_thickness="1" enabled="false" - height="16" + height="20" layout="topleft" left_pad="3" max_length="63" name="view_subject" - top_delta="0" + top_delta="-1" visible="false" - width="346" /> + width="200" /> <text type="string" - length="1" - halign="right" + halign="left" height="16" layout="topleft" - left="7" + left="10" name="lbl4" - top="80" + top_pad="10" visible="false" - width="55"> + width="60"> Message: </text> <text_editor + follows="top|left|right" enabled="false" - height="206" - hide_scrollbar="true" + height="160" layout="topleft" - left_delta="0" + left="0" + right="-1" max_length="511" name="view_message" - top_delta="-42" - width="404" + top_delta="-40" + width="313" word_wrap="true" /> - <button - height="20" - label="Open Attachment" - label_selected="Open Attachment" - layout="topleft" - left_delta="0" - name="open_attachment" - top_pad="4" - width="110" /> <line_editor enabled="false" - height="16" + height="20" layout="topleft" - left_pad="3" + left="5" max_length="63" mouse_opaque="false" name="view_inventory_name" - top_delta="1" - width="264" /> - <icon - height="16" + top_pad="8" + width="250"/> + <button + follows="left|top" + height="23" + label="Open Attachment" layout="topleft" - left_delta="0" - name="view_inv_icon" - top_delta="0" - width="16" /> - </panel> + left="5" + name="open_attachment" + top_pad="5" + width="180" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml new file mode 100644 index 0000000000..cded4cf31a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + height="90" + label="instant_message" + layout="topleft" + left="0" + name="panel_group_notify" + top="0" + width="305"> + <string + name="message_max_lines_count" + value="7" /> + <string + name="subject_font" + value="SANSSERIF_BIG" /> + <string + name="date_font" + value="SANSSERIF" /> + <panel + background_visible="true" + follows="top" + height="30" + label="header" + layout="topleft" + left="0" + name="header" + top="0" + width="305"> + <icon + follows="all" + height="20" + layout="topleft" + left="5" + mouse_opaque="true" + name="group_icon" + top="5" + width="20" /> + <text + follows="all" + font="SansSerifBig" + height="20" + layout="topleft" + left_pad="10" + name="title" + text_color="GroupNotifyTextColor" + top="5" + use_ellipses="true" + value="Sender Name / Group Name" + width="230" /> + </panel> + <text_editor + parse_urls="true" + enabled="true" + follows="all" + height="0" + layout="topleft" + left="25" + max_length="2147483647" + name="message" + parse_highlights="true" + read_only="true" + text_color="GroupNotifyTextColor" + top="40" + type="string" + use_ellipses="true" + value="message" + width="270" + word_wrap="true" > + </text_editor> + <icon + bottom="60" + follows="left|bottom|right" + height="15" + layout="topleft" + left="25" + mouse_opaque="true" + name="attachment_icon" + width="15" /> + <text + bottom="60" + follows="left|bottom|right" + font="SansSerif" + height="15" + layout="topleft" + left="45" + name="attachment" + parse_urls="false" + text_color="GroupNotifyTextColor" + value="Attachment" + use_ellipses="true" + width="250" /> + <button + bottom="85" + follows="bottom" + height="20" + label="OK" + layout="topleft" + right="-10" + name="btn_ok" + width="70" /> +</panel> 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 c758da4b63..4af4774304 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,654 +1,501 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - height="466" + height="680" label="Members & Roles" layout="topleft" - left="1" + left="0" + top="0" name="roles_tab" - top="466" - width="418"> + width="304"> <panel.string name="default_needs_apply_text"> - There are unapplied changes on the current sub-tab. + There are unsaved changes </panel.string> <panel.string name="want_apply_text"> - Do you want to apply these changes? + Do you want to save your changes? </panel.string> <panel.string name="help_text" /> - <button - height="16" - label="?" - layout="topleft" - left="391" - name="help_button" - top="8" - width="20" /> - <panel - height="24" - layout="topleft" - left="7" - name="members_header" - top="0" - width="380"> - <text - type="string" - length="1" - font="SansSerifBig" - height="16" - layout="topleft" - left="0" - name="static" - top="4" - width="150"> - Members & Roles - </text> - <text - type="string" - length="1" - height="32" - layout="topleft" - left_delta="0" - name="static2" - top_pad="4" - width="400"> - Group Members are assigned Roles with Abilities. These settings can -easily be customized, allowing for greater organization and flexibility. - </text> - </panel> - <panel - height="24" - layout="topleft" - left_delta="0" - name="roles_header" - top_delta="0" - visible="false" - width="380"> - <text - type="string" - length="1" - font="SansSerifBig" - height="16" - layout="topleft" - left="0" - name="static" - top="4" - width="100"> - Roles - </text> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="role_properties_modifiable" - top_pad="4" - visible="false" - width="394"> - Select a Role below. You can modify its Name, Description and Member Title. - </text> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="role_properties_not_modifiable" - top_delta="0" - width="394"> - Select a Role below to see its properties, Members and allowed Abilities. - </text> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="role_actions_modifiable" - top_delta="14" - visible="false" - width="394"> - You can also assign Abilities to the Role. - </text> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - name="role_actions_not_modifiable" - top_delta="0" - width="394"> - You may view, but not modify, assigned Abilities. - </text> - </panel> - <panel - height="24" - layout="topleft" - left_delta="0" - name="actions_header" - top_delta="20" - visible="false" - width="380"> - <text - type="string" - length="1" - font="SansSerifBig" - height="16" - layout="topleft" - left="0" - name="static" - top="-16" - width="200"> - Abilities - </text> - <text - type="string" - length="1" - height="32" - layout="topleft" - left_delta="0" - name="static2" - top_pad="4" - width="394"> - You can view an Ability's Description and which Roles and Members can -execute the Ability. - </text> - </panel> <tab_container - height="180" + border="false" + follows="left|top|right" + height="552" + halign="center" layout="topleft" - left_delta="-1" + left="0" + right="-1" name="roles_tab_container" tab_position="top" - top_pad="10" - width="406"> + tab_height="22" + tab_min_width="90" + top="0" + width="304"> <panel - border="true" - height="164" - label="Members" + border="false" + follows="all" + height="303" + label="MEMBERS" layout="topleft" - left="1" + left="0" + right="-1" + help_topic="roles_members_tab" name="members_sub_tab" tool_tip="Members" - top="16" - width="406"> + class="panel_group_members_subtab"> <panel.string name="help_text"> You can add or remove Roles assigned to Members. Select multiple Members by holding the Ctrl key and clicking on their names. </panel.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top" - height="16" - layout="topleft" - left="4" - max_length="63" - name="search_text" - top="5" - width="100" /> - <button - font="SansSerifSmall" - height="20" - label="Search" - layout="topleft" - left_pad="5" - name="search_button" - top_delta="-2" - width="60" /> - <button - enabled="false" - font="SansSerifSmall" - height="20" - label="Show All" - layout="topleft" - left_pad="5" - name="show_all_button" - top_delta="0" - width="80" /> + <panel.string + name="donation_area"> + [AREA] m² + </panel.string> + <panel.string + name="power_folder_icon" translate="false"> + Inv_FolderClosed + </panel.string> + <panel.string + name="power_all_have_icon" translate="false"> + Checkbox_On + </panel.string> + <panel.string + name="power_partial_icon" translate="false"> + Checkbox_Off + </panel.string> + <filter_editor + layout="topleft" + top="5" + left="5" + right="-5" + height="22" + search_button_visible="false" + follows="left|top|right" + label="Filter Members" + name="filter_input" /> <name_list - column_padding="0" + column_padding="2" draw_heading="true" - heading_height="14" - height="120" + height="240" + follows="left|top|right" layout="topleft" - left="4" + left="0" + right="-1" multi_select="true" name="member_list" - top="24" - width="396"> + top_pad="5"> <name_list.columns - label="Member Name" + label="Member" name="name" - width="136" /> + relative_width="0.44" /> <name_list.columns - label="Donated Tier" + label="Donation" name="donated" - width="136" /> + relative_width="0.25" /> <name_list.columns - label="Last Login" + label="Status" name="online" - width="116" /> + relative_width="0.14" /> </name_list> <button - height="19" - label="Invite New Member ..." - layout="topleft" - left_delta="0" + height="23" + follows="top|left" + label="Invite" + left="5" name="member_invite" - top_pad="1" - width="146" /> + width="100" /> <button - height="19" - label="Eject From Group" - layout="topleft" - left_pad="103" + height="23" + label="Eject" + follows="top|left" + left_pad="10" name="member_eject" - top_delta="0" - width="146" /> - <icon - height="16" - image_name="inv_folder_plain_closed.tga" - layout="topleft" - name="power_folder_icon" - visible="false" - width="16" /> + width="100" /> </panel> <panel - border="true" - height="164" - label="Roles" + border="false" + height="303" + label="ROLES" layout="topleft" - left_delta="0" + left="0" + right="-1" + help_topic="roles_roles_tab" name="roles_sub_tab" - top_delta="0" - width="398"> + class="panel_group_roles_subtab"> + <!-- <button + enabled="false" + height="20" + label="Show All" + layout="topleft" + top="-65" + right="-5" + name="show_all_button" + width="100" />--> <panel.string name="help_text"> Roles have a title and an allowed list of Abilities -that Members can perform. Members can belong to +that Members can perform. Members can belong to one or more Roles. A group can have up to 10 Roles, including the Everyone and Owner Roles. </panel.string> <panel.string name="cant_delete_role"> - The 'Everyone' and 'Owners' Roles are special and cannot be deleted. + The 'Everyone' and 'Owners' Roles are special and can't be deleted. </panel.string> <panel.string - name="power_folder_icon"> - inv_folder_plain_closed.tga + name="power_folder_icon" translate="false"> + Inv_FolderClosed </panel.string> <panel.string - name="power_all_have_icon"> - checkbox_enabled_true.tga + name="power_all_have_icon" translate="false"> + Checkbox_On </panel.string> <panel.string - name="power_partial_icon"> - checkbox_enabled_false.tga + name="power_partial_icon" translate="false"> + Checkbox_Off </panel.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top" - height="16" - layout="topleft" - left="4" - max_length="63" - name="search_text" - top="5" - width="100" /> - <button - font="SansSerifSmall" - height="20" - label="Search" - layout="topleft" - left_pad="5" - name="search_button" - top_delta="-2" - width="60" /> - <button - enabled="false" - font="SansSerifSmall" - height="20" - label="Show All" - layout="topleft" - left_pad="5" - name="show_all_button" - top_delta="0" - width="80" /> + <filter_editor + layout="topleft" + top="5" + left="5" + right="-5" + height="22" + search_button_visible="false" + follows="left|top|right" + label="Filter Roles" + name="filter_input" /> <scroll_list column_padding="0" draw_heading="true" - follows="left|top" - heading_height="14" - height="120" + draw_stripes="false" + heading_height="23" + height="130" layout="topleft" - left="4" + search_column="1" + left="0" + follows="left|top|right" + right="-1" name="role_list" - top="23" - width="396"> + top_pad="2" + width="310"> <scroll_list.columns - label="Role Name" + label="Role" name="name" - width="126" /> + relative_width="0.45" /> <scroll_list.columns label="Title" name="title" - width="186" /> + relative_width="0.45" /> <scroll_list.columns - label="Members" + label="#" name="members" - width="76" /> + relative_width="0.15" /> </scroll_list> <button - height="19" - label="Create New Role ..." + follows="top|left" + height="23" + label="New Role" layout="topleft" - left_delta="0" + left="0" name="role_create" - top_pad="2" - width="146" /> + width="120" /> <button - height="19" + height="23" + follows="top|left" label="Delete Role" layout="topleft" - left_pad="95" + left_pad="10" name="role_delete" - top_delta="0" - width="146" /> + width="120" /> </panel> <panel - border="true" - height="164" - label="Abilities" + border="false" + height="303" + label="ABILITIES" layout="topleft" - left_delta="0" + left="0" + right="-1" + help_topic="roles_actions_tab" name="actions_sub_tab" - top_delta="0" - width="398"> + class="panel_group_actions_subtab" + tool_tip="You can view an Ability's Description and which Roles and Members can execute the Ability." + width="310"> <panel.string name="help_text"> Abilities allow Members in Roles to do specific things in this group. There's a broad variety of Abilities. </panel.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top" - height="16" - layout="topleft" - left="6" - max_length="63" - name="search_text" - top="5" - width="100" /> - <button - font="SansSerifSmall" - height="20" - label="Search" - layout="topleft" - left_pad="5" - name="search_button" - top_delta="-2" - width="60" /> - <button - enabled="false" - font="SansSerifSmall" - height="20" - label="Show All" - layout="topleft" - left_pad="5" - name="show_all_button" - top_delta="0" - width="80" /> - <scroll_list - column_padding="0" - draw_stripes="false" - follows="left|top" - height="134" - layout="topleft" - left="6" - multi_select="true" - name="action_list" - search_column="1" - tool_tip="Select an Ability to view more details." - top="23" - width="392"> - <scroll_list.columns - label="" - name="icon" - width="18" /> - <scroll_list.columns - label="" - name="action" - width="356" /> - </scroll_list> - <icon - height="16" - image_name="inv_folder_plain_closed.tga" - layout="topleft" - name="power_folder_icon" - visible="false" - width="16" /> + <panel.string + name="power_folder_icon" translate="false"> + Inv_FolderClosed + </panel.string> + <panel.string + name="power_all_have_icon" translate="false"> + Checkbox_On + </panel.string> + <panel.string + name="power_partial_icon" translate="false"> + Checkbox_Off + </panel.string> + <filter_editor + layout="topleft" + top="5" + left="5" + right="-5" + height="22" + search_button_visible="false" + follows="left|top|right" + label="Filter Abilities" + name="filter_input" /> + <scroll_list + column_padding="0" + draw_stripes="true" + height="200" + follows="left|top" + layout="topleft" + left="0" + right="-1" + 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 - height="215" + height="350" + background_visible="false" + bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" - left_delta="1" + follows="top|left|right" + left="0" + right="-1" + width="313" + mouse_opaque="false" name="members_footer" - top_pad="20" - width="406"> + top="325" + visible="false"> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left="0" + follows="left|top" + left="5" + top="8" + text_color="EmphasisColor" name="static" - top="-16" - width="100"> + width="300"> Assigned Roles </text> - <text - type="string" - length="1" - font="SansSerif" - height="16" - layout="topleft" - left_pad="50" - name="static2" - top_delta="0" - width="150"> - Allowed Abilities - </text> <scroll_list - draw_stripes="false" - enabled="false" - height="198" + draw_stripes="true" + follows="left|top|right" + height="150" layout="topleft" left="0" + right="-1" name="member_assigned_roles" - top="1" - width="145"> + top_pad="0"> <scroll_list.columns label="" name="checkbox" - width="18" /> + width="20" /> <scroll_list.columns label="" name="role" - width="109" /> + width="270" /> </scroll_list> + <text + type="string" + height="16" + layout="topleft" + follows="left|top" + left="5" + top_pad="5" + text_color="EmphasisColor" + name="static2" + width="285"> + Allowed Abilities + </text> <scroll_list - draw_stripes="false" - enabled="false" - height="198" + draw_stripes="true" + follows="left|top|right" + height="150" layout="topleft" - left_pad="5" + left="0" + right="-1" name="member_allowed_actions" - tool_tip="For Details of each Allowed Ability see the Abilities tab." - top_delta="0" - width="254"> + search_column="2" + tool_tip="For details of each allowed ability see the abilities tab" + top_pad="0"> <scroll_list.columns label="" name="icon" - width="14" /> + width="2" /> + <scroll_list.columns + label="" + name="checkbox" + width="20" /> <scroll_list.columns label="" name="action" - width="224" /> + width="270" /> </scroll_list> </panel> <panel - height="215" + height="550" + background_visible="false" + bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" - left_delta="0" + follows="top|left|right" + left="0" + right="-1" + width="313" + mouse_opaque="false" name="roles_footer" top_delta="0" - visible="false" - width="406"> + top="209" + visible="false"> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left="0" + follows="left|top" + left="5" + top="5" name="static" - top="-16" - width="100"> - Name - </text> - <text - type="string" - length="1" - font="SansSerif" - height="16" - layout="topleft" - left_pad="50" - name="static2" - top_delta="0" - width="100"> - Description + width="300"> + Role Name </text> <line_editor type="string" - length="1" - border_style="line" - border_thickness="1" - follows="left|top" - height="16" + height="20" layout="topleft" left="0" + follows="left|top|right" + right="-1" max_length="20" name="role_name" - top="0" - width="145"> - Employees + top_pad="0" + width="300"> </line_editor> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left_delta="0" + follows="left|top" + left="5" name="static3" - top_delta="16" - width="100"> - Title + top_pad="5" + width="300"> + Role Title </text> <line_editor type="string" - length="1" - border_style="line" - border_thickness="1" - follows="left|top" - height="16" + height="20" layout="topleft" - left_delta="0" + left="0" + follows="left|top|right" + right="-1" max_length="20" name="role_title" - top_delta="16" - width="145"> - (waiting) + top_pad="0" + width="300"> </line_editor> + <text + type="string" + height="16" + layout="topleft" + follows="left|top" + left="5" + name="static2" + top_pad="5" + width="200"> + Description + </text> <text_editor type="string" - length="1" - halign="left" - height="48" - hide_scrollbar="true" layout="topleft" - left="150" - max_length="254" + left="0" + follows="left|top|right" + right="-1" + max_length="295" + height="35" name="role_description" - top="0" - width="254" + top_pad="0" + width="300" word_wrap="true"> - (waiting) </text_editor> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left="0" + follows="left|top" + left="5" + text_color="EmphasisColor" name="static4" - top="58" - width="120"> + top_pad="5" + width="300"> Assigned Members </text> - <text - type="string" - length="1" - font="SansSerif" - height="16" - layout="topleft" - left_pad="30" - name="static5" - tool_tip="A list of Abilities the currently selected role can perform." - top_delta="0" - width="240"> - Allowed Abilities - </text> <name_list - draw_stripes="false" - enabled="false" - height="105" + draw_stripes="true" + height="128" layout="topleft" left="0" + follows="left|top|right" + right="-1" name="role_assigned_members" - top="74" - width="145" /> + top_pad="0" + width="300" /> <check_box - height="16" - label="Members are visible" + height="15" + label="Reveal members" + left="5" layout="topleft" - left_delta="0" name="role_visible_in_list" - tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." + tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." top_pad="4" - width="361" /> + width="300" /> + <text + type="string" + height="16" + layout="topleft" + follows="left|top" + left="5" + text_color="EmphasisColor" + name="static5" + top_pad="2" + width="300"> + Allowed Abilities + </text> <scroll_list - draw_stripes="false" - height="125" + draw_stripes="true" + height="140" layout="topleft" - left="150" + left="0" + follows="left|top|right" + right="-1" name="role_allowed_actions" search_column="2" - tool_tip="For Details of each Allowed Ability see the Abilities tab." - top="74" - width="254"> + tool_tip="For details of each allowed ability see the abilities tab" + top_pad="0" + width="300"> <scroll_list.columns label="" name="icon" @@ -656,88 +503,84 @@ things in this group. There's a broad variety of Abilities. <scroll_list.columns label="" name="checkbox" - width="16" /> + width="20" /> <scroll_list.columns label="" name="action" - width="220" /> + width="270" /> </scroll_list> </panel> - <panel - height="215" + <panel + height="424" + background_visible="false" + bg_alpha_color="FloaterUnfocusBorderColor" layout="topleft" - left_delta="0" + follows="top|left|right" + left="0" + right="-1" + width="313" + mouse_opaque="false" name="actions_footer" top_delta="0" - visible="false" - width="406"> - <text - type="string" - length="1" - font="SansSerif" - height="16" - layout="topleft" - left="0" - name="static" - top="-16" - width="100"> - Description - </text> + top="255" + visible="false"> <text_editor + bg_readonly_color="Transparent" + text_readonly_color="EmphasisColor" + font="SansSerifSmall" type="string" - length="1" enabled="false" halign="left" - height="48" - hide_scrollbar="true" layout="topleft" - left_delta="0" + follows="left|top|right" + left="0" + right="-1" + height="90" max_length="512" name="action_description" - top_delta="16" - width="404" + top="0" word_wrap="true"> This Ability is 'Eject Members from this Group'. Only an Owner can eject another Owner. </text_editor> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left_delta="0" + follows="left|top" + left="5" name="static2" - top_pad="10" - width="145"> - Roles with Ability + top_pad="1" + width="300"> + Roles with this ability </text> + <scroll_list + height="172" + layout="topleft" + follows="left|top|right" + left="5" + right="-1" + name="action_roles" + top_pad="0" + width="300" /> <text type="string" - length="1" - font="SansSerif" height="16" layout="topleft" - left_pad="5" + follows="left|top" + left="5" name="static3" - top_delta="0" - width="200"> - Members with Ability + top_pad="5" + width="300"> + Members with this ability </text> - <scroll_list - enabled="false" - height="125" - layout="topleft" - left="0" - name="action_roles" - top="74" - width="145" /> <name_list - enabled="false" - height="125" + height="122" + follows="left|top|right" layout="topleft" - left_pad="5" + left="5" + right="-1" name="action_members" - top_delta="0" - width="254" /> + top_pad="0" + width="300" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_groups.xml b/indra/newview/skins/default/xui/en/panel_groups.xml deleted file mode 100644 index bba399481b..0000000000 --- a/indra/newview/skins/default/xui/en/panel_groups.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - border="true" - follows="all" - height="347" - layout="topleft" - left="280" - name="groups" - top="24" - width="350"> - <scroll_list - bottom="302" - follows="left|top|right|bottom" - layout="topleft" - left="10" - name="group list" - top="10" - width="240"> - <scroll_list.columns - label="" - name="name" - width="248" /> - </scroll_list> - <text - type="string" - length="1" - follows="left|bottom" - height="16" - layout="topleft" - left_delta="2" - mouse_opaque="false" - name="groupdesc" - top_pad="7" - width="248"> - Your currently active group is displayed in bold. - </text> - <text - type="string" - length="1" - follows="left|bottom" - height="16" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="groupcount" - top_pad="1" - width="248"> - You belong to [COUNT] groups (of [MAX] maximum). - </text> - <locate - height="0" - layout="topleft" - left="-90" - top="7" - width="1" /> - <button - follows="top|right" - height="22" - label="IM/Call" - layout="topleft" - left_delta="0" - name="IM" - tool_tip="Open Instant Message session" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Info" - layout="topleft" - left_delta="0" - name="Info" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Activate" - layout="topleft" - left_delta="0" - name="Activate" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Leave" - layout="topleft" - left_delta="0" - name="Leave" - top_pad="3" - width="80" /> - <button - follows="top|right" - height="22" - label="Create..." - layout="topleft" - left_delta="0" - name="Create" - top_pad="13" - width="80" /> - <button - follows="top|right" - height="22" - label="Search..." - layout="topleft" - left_delta="0" - name="Search..." - top_pad="3" - width="80" /> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml new file mode 100644 index 0000000000..e2e9d0aef0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_hint.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + width="205" + height="100"> + <text name="hint_title" + font="SansSerifMedium" + left="8" + right="180" + top="8" + bottom="20" + follows="left|right|top" + text_color="Black" + wrap="false"/> + <text name="hint_text" + left="8" + right="197" + top="26" + bottom="92" + follows="all" + text_color="Black" + wrap="true"/> + <button right="197" + top="8" + width="16" + height="16" + name="close" + follows="right|top" + image_color="DkGray" + image_unselected="Icon_Close_Foreground" + image_selected="Icon_Close_Press"/> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml new file mode 100644 index 0000000000..3e9614a9b7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_hud.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top|bottom" + height="728" + layout="topleft" + left="0" + mouse_opaque="false" + name="hud" + top="778" + width="1024" /> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml new file mode 100644 index 0000000000..aa0edbfb8a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + height="300" + name="panel_im_control_panel" + width="150"> + <avatar_icon + follows="left|top" + height="105" + left_delta="20" + name="avatar_icon" + top="-5" + width="114"/> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="183" + layout="topleft" + left="5" + name="button_stack" + orientation="vertical" + top_pad="5" + width="145"> + <layout_panel + mouse_opaque="false" + auto_resize="true" + follows="top|left" + height="0" + layout="topleft" + left="2" + min_height="0" + width="140" + top="0" + name="spacer" + user_resize="false" /> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="20" + layout="topleft" + min_height="20" + width="140" + name="view_profile_btn_panel" + user_resize="false"> + <button + follows="left|top|right" + height="23" + label="Profile" + name="view_profile_btn" + top="0" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="add_friend_btn_panel" + user_resize="false"> + <button + follows="left|top|right" + height="23" + label="Add Friend" + name="add_friend_btn" + top="5" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="teleport_btn_panel" + user_resize="false"> + <button + auto_resize="false" + follows="left|top|right" + height="23" + label="Teleport" + name="teleport_btn" + tool_tip = "Offer to teleport this person" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="share_btn_panel" + user_resize="false"> + <button + auto_resize="true" + follows="left|top|right" + height="23" + label="Share" + name="share_btn" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="pay_btn_panel" + user_resize="false"> + <button + auto_resize="true" + follows="left|top|right" + height="23" + label="Pay" + name="pay_btn" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="call_btn_panel" + user_resize="false"> + <button + follows="left|top|right" + height="23" + label="Call" + name="call_btn" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="end_call_btn_panel" + user_resize="false" + visible="false"> + <button + follows="left|top|right" + height="23" + label="End Call" + name="end_call_btn" + width="140" /> + </layout_panel> + <layout_panel + auto_resize="false" + follows="top|left|right" + height="25" + layout="topleft" + min_height="25" + width="140" + name="voice_ctrls_btn_panel" + user_resize="false" + visible="false"> + <button + follows="left|top|right" + height="23" + label="Voice Controls" + name="voice_ctrls_btn" + width="140" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml new file mode 100644 index 0000000000..34fd3352a3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + height="152" + label="im_panel" + layout="topleft" + left="0" + name="im_panel" + top="0" + width="305"> + <string + name="message_max_lines_count"> + 6 + </string> + <panel + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + follows="top" + height="24" + label="im_header" + layout="topleft" + left="5" + mouse_opaque="false" + name="im_header" + top="5" + width="295"> + <avatar_icon + follows="right" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="false" + name="avatar_icon" + top="3" + width="18" /> + <group_icon + follows="right" + height="18" + default_icon_name="Generic_Group" + layout="topleft" + left="3" + mouse_opaque="false" + name="group_icon" + top="3" + width="18" /> + <avatar_icon + color="Green" + follows="right" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="false" + name="adhoc_icon" + top="3" + width="18" /> + <text + follows="left|right" + font.style="BOLD" + height="12" + layout="topleft" + left_pad="5" + name="user_name" + text_color="white" + top="8" + use_ellipses="true" + value="Erica Vader" + width="212" /> + <!-- TIME STAMP --> + <text + font="SansSerifSmall" + follows="right" + height="13" + layout="topleft" + halign="right" + right="-5" + name="time_box" + top="8" + value="23:30" + width="50" /> + </panel> + <text + font="SansSerifSmall" + follows="all" + height="97" + layout="topleft" + left="10" + name="message" + text_color="white" + top="33" + use_ellipses="true" + value="" + width="285" + word_wrap="true" + max_length="350" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml new file mode 100644 index 0000000000..2e38835810 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="20" + layout="topleft" + left="0" + name="inventory_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="20" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="0" + name="item_icon" + top="0" + width="16" /> + <text + follows="left|right" + height="20" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="4" + value="..." + width="359" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index e252788c69..f8ae238148 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -1,258 +1,302 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" - height="560" - label="Landmark" + follows="all" + height="570" layout="topleft" left="0" + min_height="350" name="landmark_info" - top="800" - width="355"> - <panel.string - name="not_available"> - (N\A) - </panel.string> - <panel.string - name="unknown"> - (unknown) - </panel.string> - <panel.string - name="public"> - (public) - </panel.string> - <panel.string + top="20" + width="333"> + <string + name="title_create_landmark" + value="Create Landmark" /> + <string + name="title_edit_landmark" + value="Edit Landmark" /> + <string + name="title_landmark" + value="Landmark" /> + <string + name="not_available" + value="(N\A)" /> + <string + name="unknown" + value="(unknown)" /> + <string + name="public" + value="(public)" /> + <string name="server_update_text"> Place information not available without server update. - </panel.string> - <panel.string + </string> + <string name="server_error_text"> Information about this location is unavailable at this time, please try again later. - </panel.string> - <panel.string + </string> + <string name="server_forbidden_text"> Information about this location is unavailable due to access restrictions. Please check your permissions with the parcel owner. - </panel.string> - <panel.string + </string> + <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - </panel.string> + </string> + <!-- Texture names for rating icons --> + <string + name="icon_PG" + translate="false" + value="Parcel_PG_Dark" /> + <string + name="icon_M" + translate="false" + value="Parcel_M_Dark" /> + <string + name="icon_R" + translate="false" + value="Parcel_R_Dark" /> <button follows="top|left" - height="20" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" layout="topleft" - left="10" + left="9" name="back_btn" - picture_style="true" - top="20" - width="20" /> + tool_tip="Back" + tab_stop="false" + top="4" + width="30" /> <text - type="string" - length="1" - follows="left|top|right" + follows="top|left|right" font="SansSerifHugeBold" - height="20" + height="26" layout="topleft" - left="50" - name="panel_title" - text_color="white" - top="20" - width="150"> - Landmark - </text> - <texture_picker - follows="top|left" - height="128" - layout="topleft" - left="10" - name="logo" - top="60" - width="128" /> - <text - follows="left|top|right" - font="SansSerifHugeBold" - height="20" - layout="topleft" - left="10" - name="region_name" - text_color="white" - top="180" - width="340" /> - <text - follows="left|top|right" - font="SansSerifBold" - height="20" + left_pad="7" + name="title" + text_color="LtGray" + top="3" + use_ellipses="true" + value="Place Profile" + width="280" /> + <scroll_container + color="DkGray2" + follows="all" + height="532" layout="topleft" - left="10" - name="parcel_name" - text_color="white" - top="205" - width="340" /> - <panel - follows="left|top|right|bottom" - height="335" - layout="topleft" - left="0" - name="info_panel" - top="225" - width="355"> - <text_editor - bg_focus_color="0.3 0.3 0.3 1" - bg_readonly_color="0.3 0.3 0.3 1" + left="9" + name="place_scroll" + opaque="true" + top_pad="10" + width="310"> + <panel + bg_alpha_color="DkGray2" follows="left|top|right" - font="SansSerif" - height="90" - hide_border="true" - hide_scrollbar="true" + height="630" layout="topleft" - left="10" - max_length="1000" - name="description" - read_only="true" - text_color="white" + left="0" + min_height="300" + name="scrolling_panel" top="0" - width="340" /> - <icon - follows="top|left" - height="30" - image_name="" - layout="topleft" - left="10" - mouse_opaque="true" - name="maturity" - top="95" - width="30" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="owner_lable" - text_color="white" - top="130" - width="50" - word_wrap="true"> - Owner: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="owner" - text_color="white" - top="130" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="creator_lable" - text_color="white" - top="150" - width="50" - word_wrap="true"> - Creator: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="creator" - text_color="white" - top="150" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="created_lable" - text_color="white" - top="170" - width="50" - word_wrap="true"> - Created: - </text> - <text - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="80" - name="created" - text_color="white" - top="170" - width="260" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="title_lable" - text_color="white" - top="190" - width="50" - word_wrap="true"> - Title: - </text> - <line_editor - follows="left|top|right" - font="SansSerif" - height="22" - layout="topleft" - left="10" - max_length="255" - name="title_editor" - top="210" - width="330" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="10" - name="notes_lable" - text_color="white" - top="240" - width="90" - word_wrap="true"> - My Notes: - </text> - <text_editor - follows="left|top|bottom|right" - font="SansSerif" - height="70" - hide_scrollbar="true" - layout="topleft" - left="10" - max_length="1000" - name="notes_editor" - top="260" - width="330" /> - </panel> + width="310"> + <texture_picker + enabled="false" + fallback_image="default_land_picture.j2c" + follows="left|top|right" + height="197" + layout="topleft" + left="11" + name="logo" + top="10" + width="290" /> + <text + follows="left|top|right" + font="SansSerifLarge" + height="14" + layout="topleft" + left="10" + name="region_title" + text_color="white" + top_pad="10" + use_ellipses="true" + value="SampleRegion" + width="280" /> + <text + follows="left|top|right" + height="14" + layout="topleft" + left="10" + name="parcel_title" + top_pad="10" + use_ellipses="true" + value="SampleParcel, Name Long (145, 228, 26)" + width="280" /> + <expandable_text + follows="left|top|right" + height="50" + layout="topleft" + left="10" + name="description" + top_pad="10" + value="Du waltz die spritz" + width="280" /> + <icon + follows="top|left" + height="16" + image_name="unknown" + layout="topleft" + left="10" + name="maturity_icon" + top_pad="10" + width="18" /> + <text + follows="left|top|right" + height="16" + layout="topleft" + left_pad="5" + name="maturity_value" + top_pad="-13" + value="unknown" + width="268" /> + <panel + follows="left|top|right" + height="55" + layout="topleft" + left="10" + name="landmark_info_panel" + top_pad="10" + width="290"> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="owner_label" + top_pad="10" + value="Owner:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left="70" + name="owner" + top_delta="0" + width="200" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="creator_label" + value="Creator:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left="70" + name="creator" + top_delta="0" + width="200" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="created_label" + value="Created:" + width="50" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left="70" + name="created" + top_delta="0" + width="200" /> + </panel> + <panel + follows="left|top|right" + height="210" + layout="topleft" + left="10" + name="landmark_edit_panel" + width="290"> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="title_label" + top_pad="10" + value="Title:" + width="290" /> + <text + parse_urls="false" + follows="left|top" + height="22" + layout="topleft" + left="0" + name="title_value" + text_color="white" + top_pad="5" + use_ellipses="true" + width="290" /> + <line_editor + follows="left|top|right" + height="22" + layout="topleft" + left="0" + max_length="63" + name="title_editor" + prevalidate_callback="ascii" + text_readonly_color="white" + top_delta="0" + width="290" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="notes_label" + top_pad="10" + value="My notes:" + width="290" /> + <text_editor + bg_readonly_color="DkGray2" + follows="all" + height="70" + layout="topleft" + left="0" + max_length="127" + name="notes_editor" + read_only="true" + text_readonly_color="white" + text_type="ascii_with_newline" + top_pad="5" + width="290" + wrap="true" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="0" + name="folder_label" + top_pad="15" + value="Landmark location:" + width="290" /> + <combo_box + follows="bottom|left|right" + height="23" + layout="topleft" + left="0" + name="folder_combo" + top_pad="5" + width="200" /> + </panel> + </panel> + </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index f27b584c51..7e415f45a4 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,10 +1,190 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Landmarks" bottom="0" height="326" left="0" width="380" - border="true" follows="left|top|right|bottom"> - <inventory_panel allow_multi_select="true" border="true" bottom="0" - follows="left|top|right|bottom" height="326" left="0" mouse_opaque="true" - name="landmarks_list" width="380"/> - <button bottom="0" halign="center" height="16" label=">" enabled="false" - mouse_opaque="false" name="selector" width="20" left="0" - follows="right|bottom" tool_tip="View landmark properties"/> +<panel + name="Landmarks" + top="0" + height="400" + layout="topleft" + left="0" + width="313" + help_topic="panel_landmarks" + border="false" + background_visible="true" + bg_alpha_color="DkGray" + follows="all"> + <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + follows="all" + height="373" + layout="topleft" + left="3" + name="landmarks_accordion" + top="0" + width="307"> + <accordion_tab + layout="topleft" + name="tab_favorites" + title="Favorites bar"> + <places_inventory_panel + allow_multi_select="true" + border="false" + bottom="0" + follows="all" + height="126" + left="0" + mouse_opaque="true" + name="favorites_list" + start_folder="Favorites" + width="307"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_landmarks" + title="My Landmarks"> + <places_inventory_panel + allow_multi_select="true" + border="false" + bottom="0" + follows="all" + height="126" + left="0" + mouse_opaque="true" + name="landmarks_list" + start_folder="Landmarks" + width="307"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_inventory" + title="My Inventory"> + <places_inventory_panel + allow_multi_select="true" + border="false" + bottom="0" + follows="all" + height="126" + left="0" + mouse_opaque="true" + name="my_inventory_list" + start_folder="My Inventory" + width="307"/> + </accordion_tab> + <accordion_tab + layout="topleft" + name="tab_library" + title="Library"> + <places_inventory_panel + allow_multi_select="true" + border="false" + bottom="0" + follows="all" + height="126" + left="0" + mouse_opaque="true" + name="library_list" + start_folder="LIBRARY" + width="313"/> + </accordion_tab> + </accordion> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="27" + layout="bottomleft" + left="3" + name="bottom_panel" + width="313"> + + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="25" + layout="topleft" + orientation="horizontal" + top_pad="1" + left="0" + name="bottom_panel" + width="307"> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="options_gear_btn_panel" + width="32"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="add_btn_panel" + width="32"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="0" + name="add_btn" + tool_tip="Add new landmark" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + layout="topleft" + name="dummy_panel" + width="212"> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left="0" + top="0" + name="dummy_icon" + width="211" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="trash_btn_panel" + width="31"> + <dnd_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left="0" + layout="topleft" + name="trash_btn" + tool_tip="Remove selected landmark" + top="0" + width="31"/> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 20da8aa41e..891616b838 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -1,221 +1,216 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="left|top|right|bottom" - height="600" - layout="topleft" - left="0" - name="panel_login" - top="600" - width="800"> - <panel.string +follows="all" +height="600" +layout="topleft" +left="0" +name="panel_login" +top="600" + width="996"> +<panel.string name="create_account_url"> - http://secondlife.com/registration/ - </panel.string> - <panel.string - name="real_url"> - http://secondlife.com/app/login/ - </panel.string> - <panel.string + http://join.secondlife.com/ +</panel.string> +<panel.string + name="real_url" translate="false"> + http://secondlife.com/app/login/ +</panel.string> + <string name="reg_in_client_url" translate="false"> + http://secondlife.eniac15.lindenlab.com/reg-in-client/ +</string> +<panel.string name="forgot_password_url"> - http://secondlife.com/account/request.php - </panel.string> - <web_browser - border_visible="false" - bottom="600" - follows="top|left|bottom|right" - layout="topleft" - left="0" - name="login_html" - right="-1" - start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" - top="1" /> - <text - type="string" - length="1" - follows="left|bottom" - font="SansSerif" - height="16" - layout="topleft" - left="32" - name="first_name_text" - top="530" - width="120"> - First Name: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|bottom" - font="SansSerif" - handle_edit_keys_directly="true" - height="20" - layout="topleft" - left_delta="0" - max_length="31" - name="first_name_edit" - select_on_focus="true" - top_pad="4" - width="120" /> - <text - type="string" - length="1" - follows="left|bottom" - font="SansSerif" - height="16" - layout="topleft" - left="164" - name="last_name_text" - top="530" - width="120"> - Last Name: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|bottom" - font="SansSerif" - handle_edit_keys_directly="true" - height="20" - layout="topleft" - left_delta="0" - max_length="31" - name="last_name_edit" - select_on_focus="true" - top_pad="4" - width="120" /> - <text - type="string" - length="1" - follows="left|bottom" - font="SansSerif" - height="16" - layout="topleft" - left="296" - name="password_text" - top="530" - width="120"> - Password: - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|bottom" - font="SansSerif" - handle_edit_keys_directly="true" - height="20" - layout="topleft" - left_delta="0" - max_length="16" - name="password_edit" - select_on_focus="true" - top_pad="4" - width="120" /> - <text - type="string" - length="1" - follows="left|bottom" - font="SansSerif" - height="16" - layout="topleft" - left="32" - name="start_location_text" - top="574" - width="95"> - Start Location: - </text> - <combo_box - allow_text_entry="true" - control_name="LoginLocation" - follows="left|bottom" - height="18" - layout="topleft" - left_pad="2" - max_chars="128" - name="start_location_combo" - top_delta="0" - width="155"> - <combo_box.item - label="My Last Location" + http://secondlife.com/account/request.php +</panel.string> +<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp --> +<web_browser + tab_stop="false" +trusted_content="true" +bg_opaque_color="Black" +border_visible="false" +bottom="600" +follows="all" +hide_loading="true" +left="0" +name="login_html" +start_url="" +top="0" +height="600" + width="980" /> +<layout_stack +follows="left|bottom|right" +name="login_widgets" +layout="topleft" +orientation="horizontal" +top="519" +width="996" +height="80"> +<layout_panel +auto_resize="false" +follows="left|bottom" +name="login" +layout="topleft" +width="695" +min_width="695" +user_resize="false" +height="80"> +<text +follows="left|bottom" +font="SansSerifSmall" +height="16" +name="username_text" +top="20" +left="20" +width="150"> +Username: +</text> +<line_editor +follows="left|bottom" +height="22" +label="Username" +left_delta="0" +max_length="31" +name="username_edit" +select_on_focus="true" +tool_tip="[SECOND_LIFE] Username" +top_pad="0" +width="150" /> +<text +follows="left|bottom" +font="SansSerifSmall" +height="15" +left_pad="8" +name="password_text" +top="20" + width="150"> + Password: +</text> +<line_editor +follows="left|bottom" + height="22" + max_length="16" +name="password_edit" +select_on_focus="true" + top_pad="0" + width="135" /> + <check_box +control_name="RememberPassword" +follows="left|bottom" +font="SansSerifSmall" +height="16" +label="Remember password" + top_pad="3" + name="remember_check" + width="135" /> +<button + follows="left|bottom" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + left_pad="10" + name="connect_btn" + top="35" + width="90" /> + <text + follows="left|bottom" + font="SansSerifSmall" + height="15" + left_pad="18" + name="start_location_text" +top="20" + width="130"> + Start at: + </text> +<combo_box +allow_text_entry="true" +control_name="LoginLocation" + follows="left|bottom" + height="23" +max_chars="128" +top_pad="0" +name="start_location_combo" + width="170"> +<combo_box.item +label="My last location" +name="MyLastLocation" value="last" /> - <combo_box.item - label="My Home" +<combo_box.item +label="My home" +name="MyHome" value="home" /> - <combo_box.item - label="<Type region name>" - value="" /> - </combo_box> - <check_box - control_name="RememberPassword" - follows="left|bottom" - height="16" - label="Remember password" - layout="topleft" - left_pad="8" - name="remember_check" - top_delta="0" - width="138" /> - <button - follows="left|bottom" - height="24" - label="Log In" - label_selected="Log In" - layout="topleft" - left="435" - name="connect_btn" - top="548" - width="120" /> - <combo_box - allow_text_entry="true" - follows="left|bottom" - height="18" - layout="topleft" - left_pad="15" - name="server_combo" - top_delta="2" - width="120" /> - <text - type="string" - length="1" - follows="right|bottom" - halign="right" - height="16" - hover="true" - hover_color="0.2 0.45 0.72 1" - layout="topleft" - left="-210" - name="create_new_account_text" - top="539" - width="200"> - Sign up for account - </text> - <text - type="string" - length="1" - follows="right|bottom" - halign="right" - height="16" - hover="true" - hover_color="0.2 0.45 0.72 1" - layout="topleft" - left_delta="0" - name="forgot_password_text" - top_pad="4" - width="200"> - Forgot your name or password? - </text> - <text - type="string" - length="1" - follows="right|bottom" - halign="right" - height="16" - hover="true" - hover_color="0.2 0.45 0.72 1" - layout="topleft" - left="-310" - name="channel_text" - top="579" - width="300"> - [VERSION] - </text> +<combo_box.item +label="<Type region name>" +name="Typeregionname" value="" /> +</combo_box> +<combo_box +allow_text_entry="true" +font="SansSerifSmall" + follows="left|right|bottom" + height="23" + max_chars="256" +layout="topleft" +top_pad="2" +name="server_combo" +width="135" + visible="false" /> +</layout_panel> +<layout_panel +tab_stop="false" +follows="right|bottom" +name="links" +width="200" +min_width="200" +user_resize="false" +height="80"> + <text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +top="12" +right="-10" +name="create_new_account_text" + width="180"> + Sign up + </text> +<text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="forgot_password_text" +top_pad="12" +right="-10" + width="180"> + Forgot your name or password? +</text> +<text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="login_help" +top_pad="2" +right="-10" + width="180"> + Need help logging in? </text> +<!-- <text + follows="right|bottom" + font="SansSerifSmall" + halign="right" + height="28" + top_pad="2" + name="channel_text" + width="180" + word_wrap="true"> + [VERSION] + </text>--> + </layout_panel> +</layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml new file mode 100644 index 0000000000..16529f4064 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + default_tab_group="1" + follows="all" + height="423" + label="Things" + layout="topleft" + min_height="350" + min_width="240" + name="main inventory panel" + width="330"> + <panel.string + name="Itemcount"> + </panel.string> + <panel.string + name="ItemcountFetching"> + Fetching [ITEM_COUNT] Items... [FILTER] + </panel.string> + <panel.string + name="ItemcountCompleted"> + [ITEM_COUNT] Items [FILTER] + </panel.string> + <panel.string + name="ItemcountUnknown"> + + </panel.string> + <text + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left="12" + name="ItemcountText" + font="SansSerifMedium" + text_color="EmphasisColor" + top_pad="0" + width="300"> + Items: + </text> + <filter_editor + text_pad_left="10" + follows="left|top|right" + height="23" + label="Filter Inventory" + layout="topleft" + left="10" + max_length="300" + name="inventory search editor" + top="18" + width="303" /> + <tab_container + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + background_visible="true" + background_opaque="true" + follows="all" + halign="center" + height="339" + layout="topleft" + left="7" + name="inventory filter tabs" + tab_height="30" + tab_group="1" + tab_position="top" + tab_min_width="100" + top_pad="10" + width="312"> + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="338" + label="MY INVENTORY" + help_topic="my_inventory_tab" + layout="topleft" + left="0" + name="All Items" + sort_order_setting="InventorySortOrder" + show_item_link_overlays="true" + top="16" + width="288" /> + <recent_inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="338" + label="RECENT" + help_topic="recent_inventory_tab" + layout="topleft" + left_delta="0" + name="Recent Items" + show_item_link_overlays="true" + width="290" /> + </tab_container> + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="25" + layout="topleft" + orientation="horizontal" + top_pad="0" + left="10" + name="bottom_panel" + width="307"> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="options_gear_btn_panel" + width="32"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="add_btn_panel" + width="32"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="0" + name="add_btn" + tool_tip="Add new item" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + layout="topleft" + name="dummy_panel" + width="212"> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left="0" + top="0" + name="dummy_icon" + width="211" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="trash_btn_panel" + width="31"> + <dnd_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left="0" + layout="topleft" + name="trash_btn" + tool_tip="Remove selected item" + top="0" + width="31"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml new file mode 100644 index 0000000000..84b5d11ba7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_me.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + border="false" + follows="all" + height="570" + label="My Profile" + layout="topleft" + left="0" + name="panel_me" + top="0" + width="333"> + <!--<text + type="string" + follows="top|left|right" + font="SansSerifHugeBold" + height="20" + layout="topleft" + left="15" + name="user_name" + text_color="white" + top="0" + mouse_opaque="true" + width="280"> + (Loading...) + </text> --> + <tab_container + follows="all" + height="555" + halign="center" + layout="topleft" + left="5" + name="tabs" + tab_min_width="95" + tab_height="30" + tab_position="top" + top_pad="10" + width="317"> + <panel + class="panel_my_profile" + filename="panel_my_profile.xml" + label="MY PROFILE" + help_topic="panel_my_profile_tab" + name="panel_profile" /> + <panel + class="panel_picks" + filename="panel_picks.xml" + label="MY PICKS" + help_topic="panel_my_picks_tab" + name="panel_picks" /> + </tab_container> +</panel> 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 new file mode 100644 index 0000000000..38e8b9844f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + enabled="true" + follows="left|top|right|bottom" + height="500" + label="General" + left="102" + mouse_opaque="true" + name="Media Settings General" + help_topic = "media_settings_general" + width="365"> + + <text + bottom_delta="-25" + follows="top|left" + height="15" + left="10" + name="home_label"> + Home Page: + </text> + <text + visible="false" + bottom_delta="0" + follows="top|left" + height="15" + left_delta="64" + text_color="red" + name="home_fails_whitelist_label"> + (This page does not pass the specified whitelist) + </text> + <line_editor + max_length="1024" + bottom_delta="-24" + enabled="true" + follows="left|top" + font="SansSerif" + height="20" + left="10" + name="home_url" + tool_tip="The home page for this media source" + width="340"> + <!-- <line_editor.commit_callback + function="Media.CommitHomeURL"/> --> + </line_editor> + + <web_browser + border_visible="true" + bottom_delta="-133" + follows="top|left" + left="120" + name="preview_media" + width="128" + height="128" + start_url="about:blank" + decouple_texture_size="true" /> + + <text + bottom_delta="-15" + follows="top|left" + height="15" + left="164" + name="preview_label"> + Preview + </text> + + <text + bottom_delta="-20" + follows="top|left" + height="15" + left="10" + name="current_url_label"> + 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" + tool_tip="The current page for this media source" + value="" + width="340" /> + <button + bottom_delta="-20" + follows="top|left" + height="20" + label="Reset" + left_delta="233" + name="current_url_reset_btn" + width="110" > + <button.commit_callback + function="Media.ResetCurrentUrl"/> + </button> + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Loop" + left="10" + mouse_opaque="true" + name="auto_loop" + radio_style="false" + width="150" /> + <check_box + bottom_delta="-25" + visible="false" + enabled="false" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="First Click Interacts" + left_delta="0" + mouse_opaque="true" + name="first_click_interact" + radio_style="false" + width="150" /> + + <check_box + bottom_delta="0" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Zoom" + left_delta="0" + mouse_opaque="true" + name="auto_zoom" + radio_style="false" + width="150" /> + + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Play Media" + left="10" + mouse_opaque="true" + name="auto_play" + radio_style="false" + width="150" /> + + <text + bottom_delta="-14" + follows="top|left" + height="15" + left="30" + width="340" + enabled="false" + name="media_setting_note"> + Note: Residents can override this setting + </text> + + <check_box + bottom_delta="-25" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Auto Scale Media on Face of Object" + left="10" + mouse_opaque="true" + name="auto_scale" + radio_style="false" + width="150" /> + + <text + bottom_delta="-20" + follows="top|left" + height="15" + left="30" + name="size_label"> + Size: + </text> + + <spinner + bottom_delta="0" + decimal_digits="0" + enabled="true" + follows="left|top" + height="16" + increment="1" + initial_val="256" + label="" + label_width="0" + left_delta="40" + max_val="2048" + min_val="0" + mouse_opaque="true" + name="width_pixels" + width="50" /> + + <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="X_label"> + X + </text> + <spinner + bottom_delta="0" + decimal_digits="0" + enabled="true" + follows="left|top" + height="16" + increment="1" + initial_val="256" + label="" + label_width="0" + left_delta="20" + max_val="2048" + min_val="0" + mouse_opaque="true" + name="height_pixels" + width="50" /> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml new file mode 100644 index 0000000000..d3a58fed58 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -0,0 +1,172 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + enabled="true" + follows="left|top|right|bottom" + height="500" + label="Customize" + left="102" + mouse_opaque="true" + name="Media settings for controls" + help_topic = "media_settings_controls" + width="365"> + + <text + bottom_delta="-50" + follows="top|left" + height="15" + left="10" + name="controls_label" + text_readonly_color="LabelDisabledColor"> + Controls: + </text> + <combo_box + allow_text_entry="false" + bottom_delta="0" + follows="left|top" + height="18" + left="100" + max_chars="20" + name="controls" + width="120"> + <combo_item + name="Standard" + value="Standard"> + Standard + </combo_item> + <combo_item + name="Mini" + value="Mini"> + Mini + </combo_item> + </combo_box> + + <text + bottom_delta="-50" + enabled="false" + follows="top|left" + height="15" + left="10" + name="owner_label" + text_readonly_color="LabelDisabledColor"> + Owner + </text> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Allow Navigation & Interactivity" + left="30" + mouse_opaque="true" + name="perms_owner_interact" + radio_style="false" + width="250" /> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Show Control Bar" + left="30" + mouse_opaque="true" + name="perms_owner_control" + radio_style="false" + width="250" /> + + <text + bottom_delta="-36" + enabled="false" + follows="top|left" + height="15" + left="10" + name="group_label" + text_readonly_color="LabelDisabledColor"> + Group: + </text> + + <name_box + bottom_delta="-5" + enabled="false" + follows="left|top" + font="SansSerif" + height="20" left="60" + name="perms_group_name" + text_readonly_color="LabelDisabledColor" + value ="" + width="200" /> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Allow Navigation & Interactivity" + left="30" + mouse_opaque="true" + name="perms_group_interact" + radio_style="false" + width="250" /> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Show Control Bar" + left="30" + mouse_opaque="true" + name="perms_group_control" + radio_style="false" + width="250" /> + + <text + bottom_delta="-36" + enabled="false" + follows="top|left" + height="15" + left="10" + name="anyone_label" + text_readonly_color="LabelDisabledColor"> + Anyone + </text> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Allow Navigation & Interactivity" + left="30" + mouse_opaque="true" + name="perms_anyone_interact" + radio_style="false" + width="250" /> + + <check_box + bottom_delta="-22" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Show Control Bar" + left="30" + mouse_opaque="true" + name="perms_anyone_control" + radio_style="false" + width="250" /> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml new file mode 100644 index 0000000000..1f580831f9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + enabled="true" + follows="left|top|right|bottom" + height="500" + label="Security" + left="102" + mouse_opaque="true" + name="Media Settings Security" + help_topic = "media_settings_security" + width="365"> + <check_box + bottom_delta="-40" + enabled="true" + follows="left|top" + font="SansSerifSmall" + height="16" + initial_value="false" + label="Only Allow Access to Specified URL patterns" + left="10" + mouse_opaque="true" + name="whitelist_enable" + radio_style="false" + width="250" /> + <scroll_list + follows="top|left" + height="200" + left="30" + name="whitelist" + width="315" + enabled="true" /> + <icon + bottom_delta="-23" + right="-35" + width="16" + height="16" + image_name="Parcel_Exp_Color" + mouse_opaque="true" + follows="top|left" + name="Parcel_Exp_Color" + /> + <text + visible="true" + follows="top|left" + height="15" + left="30" + bottom_delta="0" + text_color="0.4 0.4 0.4 1.0" + name="home_url_fails_some_items_in_whitelist"> + Entries that the home page fails against are marked: + </text> + <button + bottom_delta="-36" + follows="top|left" + height="20" + label="Add" + left="30" + name="whitelist_add" + width="70" + enabled="true"> + <button.commit_callback + function="Media.whitelistAdd"/> + </button> + <button + bottom_delta="0" + follows="top|left" + height="20" + label="Delete" + left="275" + name="whitelist_del" + width="70" + enabled="true"> + <button.commit_callback + function="Media.whitelistDelete"/> + </button> + <text + visible="true" + bottom_delta="-75" + follows="top|left" + height="40" + left="30" + text_color="0.6 0.0 0.0 1.0" + word_wrap="true" + name="home_url_fails_whitelist"> +Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added. + </text> + +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml new file mode 100644 index 0000000000..37a1ed3048 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -0,0 +1,348 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="all" + height="535" + label="Profile" + layout="topleft" + left="0" + name="panel_profile" + top="0" + width="315"> + <string + name="CaptionTextAcctInfo"> + [ACCTTYPE] +[PAYMENTINFO] [AGEVERIFICATION] + </string> + <string + name="payment_update_link_url"> + http://www.secondlife.com/account/billing.php?lang=en + </string> + <string + name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=en + </string> + <string + name="my_account_link_url" + value="http://secondlife.com/account" /> + <string + name="no_partner_text" + value="None" /> + <string + name="no_group_text" + value="None" /> + <string + name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack + name="layout" + orientation="vertical" + follows="all" + layout="topleft" + left="0" + top="0" + height="510" + width="315" + border_size="0"> + <layout_panel + name="profile_stack" + follows="all" + layout="topleft" + top="0" + left="0" + height="492" + user_resize="false" + width="315"> + <scroll_container + color="DkGray2" + follows="all" + layout="topleft" + left="0" + name="profile_scroll" + opaque="true" + height="488" + width="315" + top="0"> + <panel + layout="topleft" + follows="left|top|right" + height="488" + name="scroll_content_panel" + top="0" + left="0" + width="297"> + <panel + follows="left|top|right" + height="117" + layout="topleft" + left="10" + name="second_life_image_panel" + top="0" + width="297"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="Generic_Person_Large" + follows="top|left" + height="124" + layout="topleft" + left="3" + name="2nd_life_pic" + top="10" + width="102" /> + <icon + height="102" + image_name="Blank" + layout="topleft" + name="2nd_life_edit_icon" + label="" + left="3" + tool_tip="Click the Edit Profile button below to change image" + top="10" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" + name="title_sl_descr_text" + text_color="white" + top_delta="0" + value="[SECOND_LIFE]:" + width="180" /> + <expandable_text + follows="left|top|right" + height="95" + layout="topleft" + left="107" + textbox.max_length="512" + textbox.show_context_menu="true" + name="sl_description_edit" + top_pad="-3" + translate="false" + 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. + </expandable_text> + </panel> + <panel + follows="left|top|right" + height="117" + layout="topleft" + top_pad="0" + left="10" + name="first_life_image_panel" + width="297"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="Generic_Person_Large" + follows="top|left" + height="124" + layout="topleft" + left="3" + name="real_world_pic" + width="102" /> + <icon + height="102" + image_name="Blank" + layout="topleft" + name="real_world_edit_icon" + label="" + left="3" + tool_tip="Click the Edit Profile button below to change image" + top="4" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" + name="title_rw_descr_text" + text_color="white" + top_delta="0" + value="Real World:" + width="180" /> + <expandable_text + follows="left|top|right" + height="95" + layout="topleft" + left="107" + textbox.max_length="512" + textbox.show_context_menu="true" + name="fl_description_edit" + top_pad="-3" + translate="false" + 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. + </expandable_text> + </panel> + <text + follows="left|top" + height="15" + font.style="BOLD" + font="SansSerifMedium" + layout="topleft" + left="10" + name="homepage_edit" + top_pad="0" + translate="false" + value="http://librarianavengers.org" + width="300" + word_wrap="false" + use_ellipses="true" + /> + <text + follows="left|top" + font.style="BOLD" + height="10" + layout="topleft" + left="10" + name="title_member_text" + text_color="white" + top_pad="10" + value="Resident Since:" + width="300" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + height="15" + layout="topleft" + left="10" + name="register_date" + read_only="true" + translate="false" + v_pad="0" + value="05/31/2376" + width="300" + word_wrap="true" /> + <text + follows="left|top" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_acc_status_text" + text_color="white" + top_pad="5" + value="Account Status:" + width="300" /> + <!-- <text + type="string" + follows="left|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="10" + name="my_account_link" + top_delta="0" + value="Go to Dashboard" + width="100"/> --> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + height="28" + layout="topleft" + left="10" + name="acc_status_text" + read_only="true" + top_pad="0" + translate="false" + v_pad="0" + width="300" + word_wrap="true"> + Resident. No payment info on file. + Linden. + </text_editor> + <text + follows="left|top" + font.style="BOLD" + height="15" + layout="topleft" + left="10" + name="title_partner_text" + text_color="white" + top_pad="3" + value="Partner:" + width="300" /> + <panel + follows="left|top" + height="15" + layout="topleft" + left="10" + name="partner_data_panel" + top_pad="0" + width="300"> + <name_box + follows="left|top" + height="10" + initial_value="(retrieving)" + layout="topleft" + left="0" + link="true" + name="partner_text" + top="0" + width="300" + word_wrap="true" /> + </panel> + <text + follows="left|top" + font.style="BOLD" + height="13" + layout="topleft" + left="10" + name="title_groups_text" + text_color="white" + top_pad="3" + value="Groups:" + width="300" /> + <expandable_text + follows="all" + height="113" + layout="topleft" + left="7" + name="sl_groups" + top_pad="0" + translate="false" + textbox.show_context_menu="true" + width="298" + expanded_bg_visible="true" + expanded_bg_color="DkGray"> + Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm. + </expandable_text> + </panel> + </scroll_container> + </layout_panel> + </layout_stack> + <panel + follows="bottom|left|right" + height="23" + layout="topleft" + left="0" + top_pad="1" + name="profile_me_buttons_panel" + visible="false" + width="315"> + <button + follows="bottom" + height="23" + left="6" + top="1" + label="Edit Profile" + name="edit_profile_btn" + tool_tip="Edit your personal information" + width="152" /> + </panel> + +</panel> 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 fa1abaa595..082d51ed3c 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -2,141 +2,183 @@ <panel background_opaque="true" background_visible="true" - bg_opaque_color="0.25 0.25 0.25 1" + bg_opaque_color="MouseGray" follows="left|top|right" height="60" layout="topleft" name="navigation_bar" + chrome="true" width="600"> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left="5" - name="back_btn" - picture_style="true" - tool_tip="Go back to previous location" - top="8" - width="20" /> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_forward.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left_pad="2" - name="forward_btn" - picture_style="true" - tool_tip="Go forward one location" - top_delta="0" - width="20" /> - <button - follows="left|top" - font="SansSerifSmall" - height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_home.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left_pad="5" - name="home_btn" - picture_style="true" - tool_tip="Teleport to your home location" - top_delta="0" - width="20" /> - <location_input - follows="left|right|top" - halign="right" - height="20" - label="Location" - layout="topleft" - left_pad="5" - max_chars="254" - mouse_opaque="false" - name="location_combo" - top_delta="0" - width="320"> - </location_input> - <button - follows="right|top" - height="20" - image_disabled="navbar_bg_center.tga" - image_disabled_selected="navbar_bg_center.tga" - image_hover_selected="navbar_bg_center.tga" - image_hover_unselected="navbar_bg_center.tga" - image_selected="navbar_bg_center.tga" - image_unselected="navbar_bg_center.tga" - layout="topleft" - left_pad="5" - mouse_opaque="false" - name="search_bg" - picture_style="true" - top_delta="0" - width="168" /> - <line_editor - bevel_style="none" - border_style="line" - commit_on_focus_lost="false" - follows="right|top" - halign="right" - height="18" - label="Search" - layout="topleft" - left_delta="0" - mouse_opaque="false" - name="search_input" - tool_tip="Search" - top_delta="1" - width="152" /> - <button - follows="right|top" - height="16" - image_disabled="status_search_btn.png" - image_disabled_selected="status_search_btn_pressed.png" - image_selected="status_search_btn_pressed.png" - image_unselected="status_search_btn.png" - layout="topleft" - left_delta="152" - name="search_btn" - picture_style="true" - scale_image="false" - tool_tip="Search" - top_delta="1" - width="16" /> - <button - follows="right|top" - font="SansSerifSmall" - height="20" - image_disabled="navbar_bg_button.tga" - image_disabled_selected="navbar_bg_button.tga" - image_overlay="navbar_help.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - layout="topleft" - left_pad="5" - name="help_btn" - picture_style="true" - tool_tip="Help" - top_delta="-2" - width="20" /> + <icon + follows="all" + image_name="NavBar_BG" + mouse_opaque="false" + name="bg_icon" + scale_image="true" + visible="true" + left="0" + top="0" + height="60" + width="600"/> + <icon + follows="all" + image_name="NavBar_BG_NoFav_Bevel" + mouse_opaque="false" + name="bg_icon_no_fav_bevel" + scale_image="true" + visible="false" + left="0" + top="0" + height="60" + width="600"/> + <icon + follows="all" + image_name="NavBar_BG_NoNav_Bevel" + mouse_opaque="false" + name="bg_icon_no_nav_bevel" + scale_image="true" + visible="false" + left="0" + top="0" + height="60" + width="600"/> + <panel + background_visible="false" + follows="left|top|right" + top="3" + height="23" + layout="topleft" + name="navigation_panel" + width="600"> + <pull_button + follows="left|top" + direction="down" + height="23" + image_overlay="Arrow_Left_Off" + image_bottom_pad="1" + layout="topleft" + left="10" + name="back_btn" + tool_tip="Go back to previous location" + top="2" + width="31" /> + <pull_button + follows="left|top" + direction="down" + height="23" + image_overlay="Arrow_Right_Off" + image_bottom_pad="1" + layout="topleft" + left_pad="0" + name="forward_btn" + tool_tip="Go forward one location" + top_delta="0" + width="31" /> + <button + follows="left|top" + height="23" + image_bottom_pad="1" + image_overlay="Home_Off" + layout="topleft" + left_pad="7" + name="home_btn" + tool_tip="Teleport to my home location" + top_delta="0" + width="32" /> + <location_input + follows="left|right|top" + halign="right" + height="23" + label="Location" + layout="topleft" + left_pad="7" + max_chars="254" + mouse_opaque="false" + name="location_combo" + top_delta="0" + width="266"> + <combo_list + mouse_wheel_opaque="true"/> + <!-- *TODO: Delete. Let the location_input use the correct art sizes. + <location_input.add_landmark_button + height="18" + name="location_combo_add" + width="20" /> + <location_input.info_button + height="18" + name="location_combo_info" + width="20" /> + --> + </location_input> + <!-- <button --> + <!-- follows="right|top" --> + <!-- height="20" --> + <!-- image_disabled="TextField_Search_Off" --> + <!-- image_disabled_selected="TextField_Search_Off" --> + <!-- image_hover_selected="TextField_Search_Off" --> + <!-- image_hover_unselected="TextField_Search_Off" --> + <!-- image_selected="TextField_Search_Off" --> + <!-- image_unselected="TextField_Search_Off" --> + <!-- layout="topleft" --> + <!-- left_pad="5" --> + <!-- mouse_opaque="false" --> + <!-- name="search_bg" --> + <!-- top_delta="0" --> + <!-- width="168" /> --> + <search_combo_box + follows="right|top" + halign="right" + height="23" + label="Search" + layout="topleft" + right="-10" + mouse_opaque="false" + name="search_combo_box" + tool_tip="Search" + top_delta="0" + width="200" > + <combo_editor + label="Search [SECOND_LIFE]" + name="search_combo_editor"/> + <combo_list + draw_border="true" + border.highlight_light_color="FocusColor" + border.highlight_dark_color="FocusColor" + border.shadow_light_color="FocusColor" + border.shadow_dark_color="FocusColor"/> + </search_combo_box> + </panel> <favorites_bar follows="left|right|top" - height="25" + font="SansSerifSmall" + height="15" layout="topleft" - left="5" + left="0" name="favorite" - top="32" - width="590" /> + image_drag_indication="Accordion_ArrowOpened_Off" + bottom="55" + tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!" + width="590"> + <label + follows="left|top" + height="15" + layout="topleft" + left="10" + name="favorites_bar_label" + text_color="LtGray" + tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!" + top="12" + width="102"> + Favorites Bar + </label> + <chevron_button name=">>" + image_unselected="TabIcon_Close_Off" + image_selected="TabIcon_Close_Off" + tab_stop="false" + follows="left|bottom" + tool_tip="Show more of My Favorites" + width="15" + top="15" + height="15"/> + </favorites_bar> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml deleted file mode 100644 index 50a78e1c71..0000000000 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- All our XML is utf-8 encoded. --> - -<panel - name="nearby_chat" visible="true" width="250" height="480" background_opaque="false" - background_visible="true" bevel_style="in" follows="left|top" bg_alpha_color="0.3 0.3 0.3 1.0"> - <panel bottom="380" width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption"> - <text - width="140" left="25" height="20" follows="left|right|top" - font="SansSerifBigBold" text_color="white" word_wrap="true" - mouse_opaque="true" name="sender_name" >NEARBY CHAT </text> - <icon top="25" left="180" - width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga" - mouse_opaque="true" name="nearby_speakers_btn"/> - <icon top="25" left="205" - width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga" - mouse_opaque="true" name="tearoff_btn"/> - <icon top="22" left="230" - width="15" height="15" follows="top|right" - color="1 1 1 1" enabled="true" image_name="closebox.tga" - name="close_btn"/> - </panel> - <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" /> -</panel> - 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 new file mode 100644 index 0000000000..55df70eb71 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + default_tab_group="1" + follows="left|bottom|right" + height="25" + layout="topleft" + left="0" + name="chat_bar" + top="21" + width="308"> + <line_editor + border_style="line" + border_thickness="1" + follows="left|right" + height="23" + label="Click here to chat." + layout="topleft" + left_delta="3" + left="0" + max_length="1024" + name="chat_box" + text_pad_left="5" + text_pad_right="25" + tool_tip="Press Enter to say, Ctrl+Enter to shout" + top="2" + width="283" /> + <output_monitor + auto_update="true" + follows="right" + draw_border="false" + height="16" + layout="topleft" + left_pad="-24" + mouse_opaque="true" + name="chat_zone_indicator" + top="6" + visible="true" + width="20" /> + <button + follows="right" + is_toggle="true" + width="20" + top="2" + layout="topleft" + left_pad="4" + image_disabled="ComboButton_UpOff" + image_unselected="ComboButton_UpOff" + image_selected="ComboButton_Up_On_Selected" + image_pressed="ComboButton_UpSelected" + image_pressed_selected="ComboButton_Up_On_Selected" + height="23" + name="show_nearby_chat" + tool_tip="Shows/hides nearby chat log"> + <button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="nearby_chat" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml new file mode 100644 index 0000000000..8c13ced8f3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -0,0 +1,408 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bg_opaque_image="Volume_Background" + bg_alpha_image="Volume_Background" + background_opaque="true" + background_visible="true" + layout="topleft" + width="328" + height="230" + name="nearby_media" + help_topic="nearby_media"> + <string name="media_item_count_format">(%ld media items)</string> + <string name="empty_item_text"><empty></string> + <string name="parcel_media_name">Parcel Streaming Media</string> + <string name="parcel_audio_name">Parcel Streaming Audio</string> + <string name="playing_suffix">(playing)</string> + <panel + bevel_style="in" + background_visible="false" + follows="left|right|top" + top="0" + height="35" + name="minimized_controls" + left="0"> + <button + name="all_nearby_media_disable_btn" + follows="left" + tool_tip="Turn all nearby media off" + left="8" + width="95" + height="22" + label="Stop All"> + <button.commit_callback + function="MediaListCtrl.DisableAll" /> + </button> + <button + name="all_nearby_media_enable_btn" + follows="left" + tool_tip="Turn all nearby media on" + left_pad="4" + width="95" + height="22" + label="Start All"> + <button.commit_callback + function="MediaListCtrl.EnableAll" /> + </button> + <button + name="open_prefs_btn" + image_overlay="Icon_Gear_Foreground" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + tool_tip = "Bring up media prefs" + top_delta="0" + left_pad="4" + height="22" + width="28"> + <button.commit_callback + function="MediaListCtrl.GoMediaPrefs" /> + </button> + <button + name="more_btn" + follows="right" + tool_tip="Advanced Controls" + top_delta="0" + right="-8" + width="66" + height="22" + label="More >>" + label_selected="Less <<"> + <button.commit_callback + function="MediaListCtrl.MoreLess" /> + </button> + <button + name="less_btn" + follows="right" + tool_tip="Advanced Controls" + top_delta="0" + right="-8" + width="66" + height="22" + label="More >>" + label_selected="Less <<"> + <button.commit_callback + function="MediaListCtrl.MoreLess" /> + </button> + </panel> + <panel + name="nearby_media_panel" + bevel_style="in" + border_style="line" + bg_alpha_color="0 0 0 0" + bg_opaque_color="0 0 0 0.3" + follows="left|right|top|bottom" + top_delta="30" + right="-1" + left="0" + height="200"> + <text + type="string" + length="1" + follows="top|left" + font="SansSerif" + left="10" + name="nearby_media_title" + width="100"> + Nearby Media + </text> + <text + type="string" + length="1" + follows="top|left" + font="SansSerif" + top_pad="15" + left="10" + name="show_text" + width="40"> + Show: + </text> + <combo_box + height="23" + left="50" + width="140" + top_delta="-5" + follows="left|top" + name="show_combo"> + <combo_box.item + label="All" + value="0" + name="All" /> + <combo_box.item + label="In this Parcel" + value="2" + name="WithinParcel" /> + <combo_box.item + label="Outside this Parcel" + value="3" + name="OutsideParcel" /> + <combo_box.item + label="On other Avatars" + value="4" + name="OnOthers" /> + </combo_box> + <scroll_list + follows="left|top|bottom|right" + column_padding="0" + height="105" + draw_heading="false" + draw_stripes="true" + bg_stripe_color="0.25 0.25 0.25 0.25" + top_pad="8" + left="10" + right="-10" + name="media_list"> + <scroll_list.columns + type="checkbox" + width="-1" + label="" + name="media_checkbox_ctrl" /> + <scroll_list.columns + sort_column="media_proximity" + width="-1" + label="Proximity" + name="media_proximity" /> + <scroll_list.columns + sort_column="media_visibility" + width="-1" + label="Visible" + name="media_visibility" /> + <scroll_list.columns + sort_column="media_class" + width="-1" + label="Class" + name="media_class" /> + <scroll_list.columns + label="Name" + name="media_name" /> + <scroll_list.columns + sort_column="media_debug" + width="-1" + label="Debug" + name="media_debug" /> + </scroll_list> + <panel + bevel_style="in" + background_visible="false" + follows="left|right|bottom" + name="media_controls_panel" + top_pad="5" + height="30" + left="10" + right="-10"> + <layout_stack + name="media_controls" + follows="left|right|top" + animate="false" + height="26" + layout="topleft" + top="4" + left="8" + right="-10" + border_size="0" + mouse_opaque="false" + orientation="horizontal"> + <layout_panel + name="stop" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="stop_btn" + follows="top" + image_overlay="Stop_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip="Stop selected media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Stop" /> + </button> + </layout_panel> + <layout_panel + name="play" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="play_btn" + follows="top" + image_overlay="Play_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip = "Play selected media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Play" /> + </button> + </layout_panel> + <layout_panel + name="pause" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="pause_btn" + follows="top" + image_overlay="Pause_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + top="0" + height="22" + width="22" + tool_tip = "Pause selected media"> + <button.commit_callback + function="SelectedMediaCtrl.Pause" /> + </button> + </layout_panel> + <layout_panel + name="volume_slider_ctrl" + mouse_opaque="false" + auto_resize="true" + user_resize="false" + follows="left|right" + layout="topleft" + top="0" + height="22" + min_width="100" + width="200"> + <slider_bar + name="volume_slider" + follows="left|right|top" + top="0" + height="22" + increment="0.01" + initial_value="0.5" + layout="topleft" + tool_tip="Audio volume for selected media" + width="200"> + <slider_bar.commit_callback + function="SelectedMediaCtrl.Volume" /> + </slider_bar> + </layout_panel> + <layout_panel + name="mute" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="72" + min_width="22" + width="22"> + <button + name="mute_btn" + follows="top" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + hover_glow_amount="0.15" + is_toggle="true" + layout="topleft" + scale_image="false" + tool_tip="Mute audio on selected media" + top="0" + height="20" + width="22" > + <button.commit_callback + function="SelectedMediaCtrl.Mute" /> + </button> + </layout_panel> + <layout_panel + name="zoom" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="28" + min_width="22" + width="22"> + <button + name="zoom_btn" + follows="top" + image_overlay="Zoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip="Zoom into selected media" + width="22"> + <button.commit_callback + function="SelectedMediaCtrl.Zoom" /> + </button> + </layout_panel> + <layout_panel + name="unzoom" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="21" + width="21" > + <button + name="unzoom_btn" + follows="top" + image_overlay="UnZoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip ="Zoom back from selected media" + top_delta="-4" + width="21" > + <button.commit_callback + function="SelectedMediaCtrl.Unzoom" /> + </button> + </layout_panel> + <layout_panel + name="right_bookend" + width="0" + mouse_opaque="false" + user_resize="false" /> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 767432a522..124b1cfc6b 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -1,202 +1,236 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="top|left|right|bottom" - background_visible="true" - bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" - height="705" - label="Notes and Privacy" + follows="all" + height="515" + label="Notes & Privacy" layout="topleft" - left="10" + left="0" name="panel_notes" - top="10" - width="355"> - <scroll_container - left="1" width="354" height="690" follows="left|top|right|bottom" - layout="topleft" - reserve_scroll_corner="false"> - <panel - layout="topleft" - width="320" - height="690" - left="0" - top="0"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="35" + top="0" + width="313" +> + <layout_stack + name="layout" + orientation="vertical" + follows="all" layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="10" - width="250" - word_wrap="true"> - Private Notes - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - font.style="ITALIC" - height="15" - layout="topleft" - left="10" - name="status_message" - text_color="0.1 0.1 0.1 1" - top="50" - width="300"> - Your notes about this user: - </text> - <text_editor - bg_focus_color="white" - bg_writeable_color="0.6 0.6 0.6 1" - follows="left|right" - font="SansSerif" - height="300" - hide_scrollbar="true" - layout="topleft" - left="10" - max_length="1000" - name="notes_edit" - text_color="black" - top="70" - width="280" - word_wrap="true" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifHugeBold" - height="35" - layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="410" - width="250" - word_wrap="true"> - Private Settings - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - font.style="ITALIC" - height="15" - layout="topleft" - left="10" - name="status_message" - text_color="0.1 0.1 0.1 1" - top="435" - width="300"> - This user can: - </text> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="See my online status" - layout="topleft" - left="10" - name="status_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="455" - width="300" /> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="See me on the map" - layout="topleft" - left="10" - name="map_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="480" - width="300" /> - <check_box - enabled="false" - follows="left|top" - font="SansSerifBig" - height="20" - label="Edit, delite or take my objects" - layout="topleft" - left="10" - name="objects_check" - text_disabled_color="0.1 0.1 0.1 1" - text_enabled_color="white" - top="505" - width="300" /> - <panel - layout="topleft" - follows="bottom" - height="30" left="0" - name="notes_buttons_panel" - bottom="690" - width="350"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Add Friend" - layout="topleft" - left="5" - mouse_opaque="false" - name="add_friend" - top="0" - width="75" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="IM" - layout="topleft" - left_pad="5" - name="im" - top_delta="0" - width="40" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Call" + top="0" + height="517" + width="313" + border_size="0"> + <layout_panel + name="notes_stack" + follows="all" + layout="topleft" + top="0" + left="0" + height="450" + width="313"> + <scroll_container + color="DkGray2" + follows="all" layout="topleft" - left_pad="5" - name="call" - top_delta="0" - width="50" - enabled="false"/> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" + left="0" + name="profile_scroll" + opaque="true" + height="450" + width="313" + top="0"> + <panel + height="450" + layout="topleft" + name="profile_scroll_panel" + top="0" + left="0" + width="303"> + <text + follows="left|top" + font.style="BOLD" + height="16" + layout="topleft" + left="11" + name="status_message" + text_color="white" + top="10" + value="My private notes:" + width="293" /> + <text_editor + follows="left|top" + height="120" + layout="topleft" + left="12" + max_length="1000" + name="notes_edit" + text_color="DkGray" + top_pad="3" + width="288" + word_wrap="true" /> + <text + follows="left|top" + font.style="BOLD" + height="16" + layout="topleft" + left="11" + name="status_message2" + text_color="white" + top_pad="20" + value="Allow this person to:" + width="293" /> + <check_box + enabled="false" + height="16" + label="See my online status" + layout="topleft" + left="10" + name="status_check" + width="293" /> + <check_box + enabled="false" + height="16" + label="See me on the map" + layout="topleft" + left="10" + name="map_check" + width="293" /> + <check_box + enabled="false" + height="16" + label="Edit, delete or take my objects" + layout="topleft" + left="10" + name="objects_check" + width="293" /> + </panel> + </scroll_container> + </layout_panel> + <layout_panel + follows="bottom|left" + height="30" layout="topleft" - left_pad="5" - name="teleport" - top_delta="0" - width="65" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Share" - layout="topleft" - left_pad="15" - name="share" - top_delta="0" - width="50" - enabled="false"/> - </panel> -</panel> - </scroll_container> + left="0" + name="notes_buttons_panel" + auto_resize="false" + width="313"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="2" + orientation="horizontal" + top_pad="5" + width="309"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="add_friend_btn_lp" + user_resize="false" + auto_resize="true" + width="118"> + <button + follows="bottom|left|right" + height="23" + label="Add Friend" + layout="topleft" + left="1" + mouse_opaque="false" + name="add_friend" + tool_tip="Offer friendship to the Resident" + top="0" + width="117" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="im_btn_lp" + user_resize="false" + auto_resize="true" + width="22"> + <button + follows="bottom|left|right" + height="23" + label="IM" + layout="topleft" + name="im" + tool_tip="Open instant message session" + top="0" + left="1" + width="21" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + height="23" + label="Call" + layout="topleft" + name="call" + tool_tip="Call this Resident" + left="1" + top="0" + use_ellipses="true" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="46"> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + tool_tip="Show the Resident on the map" + top="0" + left="1" + width="45" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="81"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport" + tool_tip="Offer teleport" + left="1" + top="0" + width="80" /> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml new file mode 100644 index 0000000000..59ead84127 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_opaque="false" + border_visible="false" + background_visible="true" + bg_alpha_color="1 0.3 0.3 0" + bg_opaque_color="1 0.3 0.3 0" + label="notification_panel" + layout="topleft" + left="0" + name="notification_panel" + top="0" + height="140" + translate="false" + width="305"> + <!-- THIS PANEL CONTROLS TOAST HEIGHT? --> + <panel + border_visible="false" + bevel_style="none" + background_visible="true" + bg_alpha_color="0.3 0.3 0.3 0" + bg_opaque_color="0.3 0.3 0.3 0" + follows="left|right|top" + height="100" + label="info_panel" + layout="topleft" + left="0" + name="info_panel" + top="0" + width="305"> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerif" + height="85" + layout="topleft" + left="10" + name="text_box" + read_only="true" + text_color="white" + top="10" + visible="false" + width="285" + wrap="true"/> + <text + border_visible="false" + follows="left|right|top|bottom" + font="SansSerifBold" + height="85" + layout="topleft" + left="10" + name="caution_text_box" + text_color="1 0.82 0.46 1" + top="10" + visible="false" + width="285" + wrap="true"/> + <text_editor + h_pad="0" + v_pad="0" + bg_readonly_color="0.0 0.0 0.0 0" + border_visible="false" + embedded_items="false" + enabled="false" + follows="left|right|top|bottom" + font="SansSerif" + height="85" + layout="topleft" + left="10" + mouse_opaque="false" + name="text_editor_box" + read_only="true" + tab_stop="false" + text_color="white" + text_readonly_color="white" + top="10" + visible="false" + width="285" + wrap="true" + parse_highlights="true" + parse_urls="true"/> + </panel> + <panel + background_visible="false" + follows="left|right|bottom" + height="30" + width="290" + label="control_panel" + layout="topleft" + left="10" + name="control_panel" + top_pad="5"> + <!-- + Notes: + This panel holds buttons of notification. Change of its size can affect the layout of buttons. + --> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml index c67ae41677..c3dc588ba2 100644 --- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml +++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml @@ -3,6 +3,7 @@ height="100" layout="topleft" name="notifications_panel" + translate="false" width="100"> <layout_stack follows="left|right|top|bottom" @@ -13,6 +14,9 @@ orientation="horizontal" top="20" width="100"> + <layout_panel name="notifications_list_panel" + width="100" + user_resize="true"> <scroll_list draw_heading="true" follows="left|right|top|bottom" @@ -22,8 +26,7 @@ name="notifications_list" sort_ascending="false" sort_column="2" - top="-78" - user_resize="true" + top="0" width="100"> <scroll_list.columns label="Name" @@ -38,6 +41,10 @@ name="date" width="150" /> </scroll_list> + </layout_panel> + <layout_panel name="rejects_list_panel" + width="100" + user_resize="true"> <scroll_list draw_heading="true" follows="left|right|top|bottom" @@ -47,8 +54,7 @@ name="notification_rejects_list" sort_ascending="false" sort_column="2" - top="-78" - user_resize="true" + top="0" width="100"> <scroll_list.columns label="Name" @@ -63,6 +69,7 @@ name="date" width="150" /> </scroll_list> + </layout_panel> </layout_stack> <button follows="left|right|top" @@ -71,7 +78,6 @@ layout="topleft" left_delta="0" name="header" - picture_style="true" top_delta="-20" width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml new file mode 100644 index 0000000000..b1a7697e83 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="false" + height="40" + label="friend_online_status" + layout="topleft" + left="0" + name="friend_online_status" + top="0" + width="220"> + <avatar_icon + follows="top|left" + height="18" + image_name="Generic_Person" + layout="topleft" + left="3" + mouse_opaque="false" + name="avatar_icon" + top="10" + width="18" /> + <text + font="SansSerifSmall" + follows="all" + height="13" + layout="topleft" + left_pad="5" + name="message" + text_color="white" + top="15" + use_ellipses="true" + value="" + width="189" + word_wrap="true" + max_length="350" /> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml new file mode 100644 index 0000000000..a48a9ce626 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -0,0 +1,567 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Side tray Outfit Edit panel --> +<panel + background_visible="true" + border="false" + height="600" + follows="all" + layout="topleft" + help_topic="edit_outfit" + left="0" + min_height="350" + name="outfit_edit" + top="0" + width="320"> + <string + name="No Outfit" + value="No Outfit"/> + <string + name="unsaved_changes" + value="Unsaved Changes"/> + <string + name="now_editing" + value="Now Editing"/> + <string + name="folder_view_off" + value="Hierarchy_View_Disabled" + translate="false"/> + <string + name="folder_view_on" + value="Hierarchy_View_On" + translate="false"/> + <string + name="list_view_off" + value="List_View_Disabled" + translate="false"/> + <string + name="list_view_on" + value="List_View_On" + translate="false"/> + + <panel.string + name="not_available"> + (N\A) + </panel.string> + <panel.string + name="unknown"> + (unknown) + </panel.string> + + <!-- Wearables filtering strings --> + <string name="Filter.All" value="All"/> + <string name="Filter.Clothes/Body" value="Clothes/Body"/> + <string name="Filter.Objects" value="Objects"/> + <string name="Filter.Clothing" value="Clothing"/> + <string name="Filter.Bodyparts" value="Body parts"/> + + <string + name="replace_body_part" + value="Click to replace your existing shape"/> + + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back_btn" + left="5" + tab_stop="false" + top="1" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="10" + name="title" + text_color="LtGray" + top="0" + value="Edit Outfit" + use_ellipses="true" + width="275" /> + +<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" --> + <panel + background_visible="true" + bg_alpha_color="DkGray2" + bevel_style="none" + follows="top|left|right" + height="40" + layout="topleft" + left="6" + name="header_panel" + top_pad="5" + width="311"> + <icon + follows="left|top" + height="31" + image_name="Shirt_Large" + left="2" + mouse_opaque="false" + name="outfit_icon" + top="2" + scale_image="true" + visible="true" + width="31" /> + <panel + bevel_style="none" + follows="top|left|right" + height="37" + layout="topleft" + left_pad="5" + name="outfit_name_and_status" + top="2" + width="270"> + <text + follows="top|left|right" + font="SansSerifSmallBold" + height="13" + layout="topleft" + name="status" + text_color="EmphasisColor" + top="2" + value="Now editing..." + use_ellipses="true" + width="245" /> + <text + follows="bottom|left|right" + font="SansSerifLargeBold" + height="18" + layout="topleft" + name="curr_outfit_name" + parse_urls="false" + text_color="LtGray" + top_pad="2" + value="[Current Outfit]" + use_ellipses="true" + width="245" /> + <loading_indicator + follows="right|top" + height="24" + layout="topleft" + right="-2" + name="edit_outfit_loading_indicator" + top="6" + width="24" /> + </panel> + </panel> + + +<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) --> +<!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height. +Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px. +It is calculated as border_size + 2*UIResizeBarOverlap +--> + <layout_stack + animate="true" + border_size="8" + clip="false" + default_tab_group="2" + follows="all" + height="465" + width="313" + layout="topleft" + orientation="vertical" + name="im_panels" + tab_group="1" + top_pad="5" + left="5"> + <layout_panel + layout="topleft" + height="187" + min_height="155" + name="outfit_wearables_panel" + width="313" + auto_resize="true" + user_resize="true"> + + <layout_stack + animate="true" + border_size="0" + follows="all" + height="185" + width="313" + orientation="vertical" + layout="topleft" + name="filter_panels" + top="0" + left="0"> + <layout_panel + auto_resize="true" + background_visible="false" + layout="topleft" + height="154" + name="add_button_and_combobox" + width="311" + user_resize="false" + visible="true"> + + <!-- List containing items from the COF and Base outfit --> + <panel + background_visible="false" + class="cof_wearables" + filename="panel_cof_wearables.xml" + follows="all" + height="129" + layout="topleft" + left="1" + name="cof_wearables_list" + top="0" + width="311" /> + + <button + follows="left|bottom" + height="22" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Add More..." + layout="topleft" + left="2" + name="show_add_wearables_btn" + top_pad="2" + tool_tip="Open/Close" + width="125" /> + + <combo_box + follows="left|right|bottom" + height="22" + layout="topleft" + left_pad="5" + name="list_view_filter_combobox" + top_delta="0" + visible="false" + width="152"/> + <combo_box + follows="left|right|bottom" + height="22" + layout="topleft" + left_delta="0" + name="folder_view_filter_combobox" + top_delta="0" + visible="false" + width="152"/> + + <button + follows="bottom|right" + height="22" + image_overlay="Search_Icon" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + layout="topleft" + name="filter_button" + right="-5" + top_delta="0" + visible="false" + width="20" /> + </layout_panel> + + <layout_panel + auto_resize="false" + background_visible="true" + bg_alpha_color="DkGray2" + height="30" + name="filter_panel" + width="311" + visible="false" + user_resize="false"> + + <filter_editor + background_image="TextField_Search_Off" + enabled="true" + follows="left|right|top" + label="Filter Inventory Wearables" + layout="topleft" + left="5" + width="290" + height="25" + name="look_item_filter" + search_button_visible="true" + text_color="black" + visible="true"/> + + </layout_panel> + </layout_stack> + </layout_panel> + + + <layout_panel + background_visible="false" + bg_alpha_color="DkGray2" + auto_resize="true" + default_tab_group="3" + height="450" + min_height="80" + name="add_wearables_panel" + width="313" + tab_group="2" + user_resize="true" + visible="false"> + + <!-- this icon represent dragbar between layout panels. + This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) --> + <icon + follows="left|top|right" + height="10" + image_name="Dragbar" + left="0" + top_pad="-9" + width="313" /> + + <inventory_panel + allow_multi_select="true" + background_visible="false" + border="false" + follows="left|top|right|bottom" + height="418" + layout="topleft" + left="0" + mouse_opaque="false" + name="folder_view" + top_pad="0" + width="313" + visible="false"/> + <panel + name="filtered_wearables_panel" + background_opaque="true" + background_visible="false" + layout="topleft" + follows="left|top|right|bottom" + border="false" + height="418" + left="0" + mouse_opaque="false" + width="310" + top_delta="0" + visible="true"> + <wearable_items_list + color="0.107 0.107 0.107 1" + name="list_view" + allow_select="true" + layout="topleft" + follows="all" + multi_select="true" + width="313" + height="418" + left="0" + top="0"/> + </panel> + <button + follows="bottom|left" + height="22" + left="2" + label="Wear Item" + layout="topleft" + name="plus_btn" + top_pad="5" + width="130" /> + + </layout_panel> + </layout_stack> + + + <!-- BUTTON BAR --> + <panel + background_visible="true" + bevel_style="none" + follows="bottom|left|right" + height="27" + layout="topleft" + left="5" + name="no_add_wearables_button_bar" + top_pad="0" + width="313"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="gear_menu_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_right_icon" + width="250" /> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="shop_btn_1" + top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" + width="31" /> + </panel> + + + <!-- BUTTON BAR - WEARABLES ADDING MODE --> + <panel + background_visible="true" + bevel_style="none" + follows="left|right|bottom" + height="27" + layout="topleft" + left="5" + name="add_wearables_button_bar" + top_delta="0" + visible="false" + width="313"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="wearables_gear_menu_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Hierarchy_View_Disabled" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + layout="topleft" + left_pad="1" + name="folder_view_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="List_View_On" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + layout="topleft" + left_pad="1" + name="list_view_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_right_icon" + width="186" > + </icon> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="Shop" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="shop_btn_2" + top="1" + tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" + width="31" /> + </panel> + + <!-- SAVE AND REVERT BUTTONS --> + <panel + follows="left|right|bottom" + height="30" + layout="topleft" + left="4" + top_pad="2" + name="save_revert_button_bar" + width="300"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_bar_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save" + left="1" + layout="topleft" + name="save_btn" + top="0" + width="155" /> + <button + follows="bottom|right" + height="23" + name="save_flyout_btn" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + top="0" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="revert_btn_lp" + user_resize="false" + auto_resize="true" + width="147"> + <button + follows="bottom|left|right" + height="23" + left="0" + label="Undo Changes" + layout="topleft" + name="revert_btn" + top="0" + tool_tip="Revert to last saved version" + width="147" /> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml new file mode 100644 index 0000000000..88c82313dd --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel name="Outfits" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + background_opaque="true" + background_visible="true" + follows="all" + height="575" + label="Things" + layout="topleft" + min_height="350" + min_width="240" + width="320" + border="false"> + <panel.string + name="wear_outfit_tooltip"> + Wear selected outfit + </panel.string> + <panel.string + name="wear_items_tooltip"> + Wear selected items + </panel.string> + <tab_container + follows="all" + height="539" + layout="topleft" + left="5" + name="appearance_tabs" + tab_min_width="150" + tab_height="30" + tab_position="top" + halign="center" + top="8" + width="315"> + <panel + class="outfits_list" + filename="panel_outfits_list.xml" + height="520" + name="outfitslist_tab" + background_visible="true" + help_topic="my_outfits_tab" + follows="all" + label="MY OUTFITS" + layout="topleft" + width="315" /> + <panel + background_visible="true" + bg_alpha_color="DkGray" + class="panel_wearing" + filename="panel_outfits_wearing.xml" + follows="all" + height="520" + help_topic="now_wearing_tab" + label="WEARING" + layout="topleft" + name="cof_tab" + width="315" /> + </tab_container> + + <panel + background_visible="true" + follows="bottom|left|right" + height="27" + layout="topleft" + left="9" + top_pad="1" + visible="true" + name="bottom_panel" + width="310"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_panel_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="save_btn_lp" + user_resize="false" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save As" + left="1" + layout="topleft" + name="save_btn" + top="0" + width="155" /> + <button + follows="bottom|right" + height="23" + name="save_flyout_btn" + label="" + layout="topleft" + left_pad="-20" + tab_stop="false" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="wear_btn_lp" + user_resize="false" + auto_resize="true" + width="152"> + <button + follows="bottom|left|right" + height="23" + label="Wear" + layout="topleft" + name="wear_btn" + left="0" + top="0" + width="152" /> + </layout_panel> + </layout_stack> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml new file mode 100644 index 0000000000..2c7a51f0e7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + bottom="806" + layout="topleft" + left="0" + mouse_opaque="false" + name="menu_gear_default" + visible="false"> + <menu_item_call + label="Replace Current Outfit" + layout="topleft" + name="wear"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="wear" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="wear" /> + </menu_item_call> + <menu_item_call + label="Remove From Current Outfit" + layout="topleft" + name="remove"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="remove" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="remove" /> + </menu_item_call> + <menu_item_separator + layout="topleft" + name="Outfits Gear Separator" /> + <menu_item_call + label="Rename" + layout="topleft" + name="rename"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="rename" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="rename" /> + </menu_item_call> + <menu_item_call + label="Remove Link" + layout="topleft" + name="remove_link"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="remove_link" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="remove_link" /> + </menu_item_call> + <menu_item_call + label="Delete Outfit" + layout="topleft" + name="delete"> + <on_click + function="panel_outfits_inventory_gear_default.Custom.Action" + parameter="delete" /> + <on_enable + function="panel_outfits_inventory_gear_default.Enable" + parameter="delete_outfit" /> + </menu_item_call> +</menu> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml new file mode 100644 index 0000000000..d18f0d57ca --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="DkGray" + border="false" + follows="all" + height="430" + name="Outfits" + layout="topleft" + left="0" + top="0" + width="312"> + <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]." + no_matched_tabs_text.v_pad="10" + no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]" + follows="all" + height="400" + layout="topleft" + left="3" + name="outfits_accordion" + top="0" + width="309"> + </accordion> + <panel + background_visible="true" + follows="bottom|left|right" + height="28" + layout="topleft" + left="4" + top_pad="0" + visible="true" + name="bottom_panel" + width="312"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="243"/> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="trash_btn" + tool_tip="Delete selected outfit" + width="31"/> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml new file mode 100644 index 0000000000..2fbbf6610c --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bg_alpha_color="DkGray" + follows="all" + height="430" + layout="topleft" + left="0" + name="Wearing" + top="0" + width="312"> + <wearable_items_list + follows="all" + height="400" + layout="topleft" + left="3" + multi_select="true" + name="cof_items_list" + standalone="false" + top="0" + width="309" + worn_indication_enabled="false" /> + <panel + background_visible="true" + follows="bottom|left|right" + height="28" + layout="topleft" + left="4" + name="bottom_panel" + top_pad="0" + width="312"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="options_gear_btn" + tool_tip="Show additional options" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="274" /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index f53e06494f..ab8930c967 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,443 +1,740 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Side tray panel --> <panel - layout="topleft" - top="0" left="0" width="355" height="465" - follows="left|top|right|bottom" - background_visible="true" bg_alpha_color="0.3 0.3 0.3 1" - label="People" name="people_panel" -> - <search_editor - layout="topleft" - top="3" left="10" width="335" height="16" - follows="left|top|right" - max_length="300" - label="Filter" name="filter_input" - font="SansSerif" text_color="black" - /> - <tab_container - layout="topleft" - top="30" left="10" width="335" height="400" - follows="left|top|right|bottom" - name="tabs" - tab_position="top" - bg_alpha_color="0.7 0.7 0.1 1" - > + default_tab_group="1" + follows="all" + height="449" + label="People" + layout="topleft" + left="0" + min_height="350" + name="people_panel" + top="0" + width="333"> + <string + name="no_recent_people" + value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> + <string + name="no_filtered_recent_people" + value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> + <string + name="no_one_near" + value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> + <string + name="no_one_filtered_near" + value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> + <string + name="no_friends_online" + value="No friends online" /> + <string + name="no_friends" + value="No friends" /> + <string + name="no_friends_msg"> + Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. +Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map]. + </string> + <string + name="no_filtered_friends_msg"> + Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]. + </string> + <string + name="people_filter_label" + value="Filter People" /> + <string + name="groups_filter_label" + value="Filter Groups" /> + <!-- + *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes. + They are not defined as translatable in VLT. See EXT-5931 + --> + <string + name="no_filtered_groups_msg" + value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." /> + <string + name="no_groups_msg" + value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." /> + <filter_editor + follows="left|top|right" + height="23" + layout="topleft" + left="10" + label="Filter" + max_length="300" + name="filter_input" + text_color="Black" + text_pad_left="10" + top="3" + width="303" /> + <tab_container + follows="all" + height="383" + layout="topleft" + left="5" + name="tabs" + tab_group="1" + tab_min_width="70" + tab_height="30" + tab_position="top" + top_pad="10" + halign="center" + width="317"> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="NEARBY" + layout="topleft" + left="0" + help_topic="people_nearby_tab" + name="nearby_panel" + top="0" + width="313"> + <avatar_list + allow_select="true" + follows="all" + height="356" + ignore_online_status="true" + layout="topleft" + left="3" + multi_select="true" + name="avatar_list" + top="0" + width="307" /> + <panel + background_visible="true" + follows="left|right|bottom" + height="27" + label="bottom_panel" + layout="topleft" + left="3" + name="bottom_panel" + top_pad="0" + width="313"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="nearby_view_sort_btn" + tool_tip="Options" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="add_friend_btn" + tool_tip="Add selected Resident to your friends List" + width="31"> + <commit_callback + function="People.addFriend" /> + </button> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> + </panel> + </panel> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="MY FRIENDS" + layout="topleft" + left="0" + help_topic="people_friends_tab" + name="friends_panel" + top="0" + width="313"> + <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + follows="all" + height="356" + layout="topleft" + left="3" + name="friends_accordion" + top="0" + width="307"> + <accordion_tab + layout="topleft" + height="172" + min_height="150" + name="tab_online" + title="Online"> + <avatar_list + allow_select="true" + follows="all" + height="172" + layout="topleft" + left="0" + multi_select="true" + name="avatars_online" + show_permissions_granted="true" + top="0" + width="307" /> + </accordion_tab> + <accordion_tab + layout="topleft" + height="173" + name="tab_all" + title="All"> + <avatar_list + allow_select="true" + follows="all" + height="173" + layout="topleft" + left="0" + multi_select="true" + name="avatars_all" + show_permissions_granted="true" + top="0" + width="307" /> + </accordion_tab> + </accordion> + <panel + background_visible="true" + follows="left|right|bottom" + height="27" + label="bottom_panel" + layout="topleft" + left="3" + name="bottom_panel" + top_pad="0" + width="313"> + + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="25" + layout="topleft" + orientation="horizontal" + top_pad="1" + left="0" + name="bottom_panel" + width="305"> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="options_gear_btn_panel" + width="32"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="friends_viewsort_btn" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="add_btn_panel" + width="32"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left="0" + name="add_btn" + tool_tip="Offer friendship to a Resident" + top="0" + width="31" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + layout="topleft" + name="dummy_panel" + width="212"> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left="0" + top="0" + name="dummy_icon" + width="211" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="25" + layout="topleft" + name="trash_btn_panel" + width="31"> + <dnd_button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left="0" + layout="topleft" + name="trash_btn" + tool_tip="Remove selected person from your Friends list" + top="0" + width="31"/> + </layout_panel> + </layout_stack><!-- + + <button + follows="bottom|left" + tool_tip="Options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="friends_viewsort_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="add_btn" + tool_tip="Offer friendship to a Resident" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="del_btn" + tool_tip="Remove selected person from your Friends list" + width="31" /> + --></panel> + <text + follows="all" + height="450" + left="13" + name="no_friends_help_text" + top="10" + width="293" + wrap="true" /> + </panel> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="MY GROUPS" + layout="topleft" + left="0" + help_topic="people_groups_tab" + name="groups_panel" + top="0" + width="313"> + <!-- + *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931 + Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() + --> + <group_list + allow_select="true" + follows="all" + height="356" + layout="topleft" + left="3" + name="group_list" + top="0" + width="307" /> + <panel + background_visible="true" + follows="left|right|bottom" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + top_pad="0" + width="313"> + <button + follows="bottom|left" + tool_tip="Options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="3" + name="groups_viewsort_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="plus_btn" + tool_tip="Join group/Create new group" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Activate_Checkmark" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="activate_btn" + tool_tip="Activate selected group" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> + </panel> + </panel> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="RECENT" + layout="topleft" + left="0" + help_topic="people_recent_tab" + name="recent_panel" + top="0" + width="313"> + <avatar_list + allow_select="true" + follows="all" + height="356" + layout="topleft" + left="3" + multi_select="true" + name="avatar_list" + show_last_interaction_time="true" + top="0" + width="307" /> + <panel + background_visible="true" + follows="left|right|bottom" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + top_pad="0" + width="313"> + <button + follows="bottom|left" + tool_tip="Options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="3" + name="recent_viewsort_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="add_friend_btn" + tool_tip="Add selected Resident to your friends List" + width="31"> + <commit_callback + function="People.addFriend" /> + </button> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> + </panel> + </panel> + </tab_container> <panel - layout="topleft" - height="390" width="332" - follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Nearby" name="nearby_panel" - > - <avatar_list - layout="topleft" - top="2" left="0" width="332" height="357" - follows="left|top|right|bottom" - name="avatar_list" - /> - <panel - layout="topleft" - bottom="390" left="0" width="333" height="30" - follows="left|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="9" left="305" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> - </panel> - <panel - layout="topleft" - height="390" width="332" - follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Friends" name="friends_panel" - > - <avatar_list - layout="topleft" - top="2" left="0" width="332" height="357" - follows="left|top|right|bottom" - name="avatar_list" - /> - <panel - layout="topleft" - bottom="390" left="0" width="333" height="30" - follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button - name="add_btn" - layout="topleft" - top="9" left="10" width="16" height="16" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" picture_style="true" - /> - <button - name="del_btn" - layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" - picture_style="true" - /> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top_delta="0" left_pad="239" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> - </panel> - <panel - layout="topleft" - height="390" width="332" - follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Groups" name="groups_panel" - > - <group_list - layout="topleft" - top="2" left="0" width="332" height="357" - follows="left|top|right|bottom" - name="group_list" - /> - <panel - layout="topleft" - bottom="390" left="0" width="333" height="30" - follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button - name="plus_btn" - layout="topleft" - top="9" left="10" width="16" height="16" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" - picture_style="true" - /> - <button - name="minus_btn" - layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" - picture_style="true" - /> - <button - name="activate_btn" - layout="topleft" - top_delta="0" left_pad="24" width="16" height="16" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="activate_btn.tga" - image_selected="activate_btn.tga" - image_unselected="activate_btn.tga" - picture_style="true" - /> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top_delta="0" left="305" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> - </panel> - <panel - layout="topleft" - height="390" width="332" - follows="left|top|right|bottom" - background_visible="true" bevel_style="bright" bg_alpha_color="0.7 0.7 0.7 1" - label="Recent" name="recent_panel" - > - <avatar_list - layout="topleft" - top="2" left="0" width="332" height="357" - follows="left|top|right|bottom" - name="avatar_list" - /> - <panel - layout="topleft" - bottom="390" left="0" width="333" height="30" - follows="left|right|bottom" - background_visible="true" bevel_style="in" bg_alpha_color="black" - label="bottom_panel" name="bottom_panel" - > - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="9" left="305" width="16" height="16" - follows="bottom|right" - font="SansSerifBigBold" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - picture_style="true" - /> - </panel> - </panel> - </tab_container> + follows="bottom|left|right" + height="23" + layout="topleft" + left="8" + top_pad="4" + name="button_bar" + width="313"> - <layout_stack - name="button_bar" - follows="left|right|bottom" - bottom="6" - left="6" - width="335" - height="27" - orientation="horizontal" - animate="false" - border_size="0"> - <layout_panel - name="view_profile_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="85" - width="85" - visible="true" - > - <button - label="View Profile" - name="view_profile_btn" - layout="topleft" - width="85" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="add_friend_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="85" - width="85" - visible="true" - > - <button - label="Add Friend" - name="add_friend_btn" - layout="topleft" - width="85" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="group_info_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="80" - width="80" - visible="true" - > - <button - label="Group Info" - name="group_info_btn" - layout="topleft" - width="80" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel name="chat_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="45" - width="45" - visible="true" - > - <button - label="Chat" - name="chat_btn" - layout="topleft" - width="45" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="im_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="35" - width="35" - visible="true" - > - <button - label="IM" - name="im_btn" - layout="topleft" - width="35" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="call_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="40" - width="40" - visible="false" - > - <button - label="Call" - name="call_btn" - enabled="false" - layout="topleft" - width="40" height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="teleport_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="65" - width="65" - > - <button - label="Teleport" - name="teleport_btn" - width="65" - height="25" - layout="topleft" - follows="left|top|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="share_btn_panel" - enabled="false" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="50" - width="50" - visible="false" - > - <button - label="Share" - name="share_btn" - enabled="false" - layout="topleft" - width="50" - height="25" - follows="top|left|right" - font="SansSerifSmallBold" - /> - </layout_panel> - <layout_panel - name="more_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="40" - width="40" - visible="true" - > - <button - label=">>" - name="more_btn" - enabled="false" - layout="topleft" - width="40" - height="25" - follows="top|right" - font="SansSerifSmallBold" - /> - </layout_panel> - </layout_stack> - <string name="no_people"> - No people - </string> - <string name="no_one_near"> - No-one near - </string> - <string name="no_friends"> - No friends - </string> - <panel - layout="topleft" - name="panel_profile_view" - class="panel_profile_view" - filename="panel_profile_view.xml" - top="0" - left="5" - width="345" - height="465" - follows="left|right|top|bottom" - visible="false" - /> +<!--********************************Profile; IM; Call, Share, Teleport********************************--> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="0" + orientation="horizontal" + top_pad="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="view_profile_btn_lp" + user_resize="false" + auto_resize="true" + width="68"> + <button + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + left="1" + name="view_profile_btn" + tool_tip="Show picture, groups, and other Residents information" + top="0" + width="67" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="41"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="IM" + layout="topleft" + name="im_btn" + tool_tip="Open instant message session" + top="0" + width="40" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Call" + layout="topleft" + name="call_btn" + tool_tip="Call this Resident" + top="0" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="66"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Share" + layout="topleft" + name="share_btn" + tool_tip="Share an inventory item" + top="0" + width="65" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="77"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + tool_tip="Offer teleport" + top="0" + width="76" /> + </layout_panel> + </layout_stack> + +<!--********************************Group Profile; Group Chat; Group Call buttons************************--> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls1" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="group_info_btn_lp" + user_resize="false" + auto_resize="true" + width="108"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Profile" + layout="topleft" + mouse_opaque="false" + name="group_info_btn" + tool_tip="Show group information" + top="0" + width="107" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Chat" + layout="topleft" + mouse_opaque="false" + name="chat_btn" + tool_tip="Open chat session" + top="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="group_call_btn_lp" + user_resize="false" + auto_resize="true" + width="96"> + <button + follows="bottom|left|right" + left="1" + height="23" + label="Group Call" + layout="topleft" + mouse_opaque="false" + name="group_call_btn" + tool_tip="Call this group" + top="0" + width="95" /> + </layout_panel> + </layout_stack> + </panel> </panel> 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 fa04ba7f15..0496c86215 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -1,184 +1,193 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bevel_style="in" - bg_alpha_color="0.2 0.2 0.2 1" - height="640" + follows="all" + height="570" layout="topleft" left="0" + min_height="350" name="panel_pick_info" + help_topic="profile_pick_info" top="0" - width="355"> + width="333"> <button follows="top|left" - height="20" - image_overlay="navbar_back.tga" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" layout="topleft" - left="10" name="back_btn" - picture_style="true" - top="5" - width="20" /> + left="10" + tab_stop="false" + top="2" + width="30" /> <text - type="string" - length="1" - follows="top" + follows="top|left|right" font="SansSerifHugeBold" - height="15" + height="26" layout="topleft" - left="40" + left_pad="4" name="title" - text_color="white" - top="0" - width="150"> - Pick Info - </text> + text_color="LtGray" + top="2" + value="Pick Info" + use_ellipses="true" + width="275" /> + <scroll_container + color="DkGray2" + opaque="true" + follows="all" + height="503" + layout="topleft" + left="8" + top_pad="10" + name="profile_scroll" + width="312"> <panel - background_visible="true" - bg_alpha_color="0.5 0.5 0.5 1" - follows="left|right|top|bottom" - height="570" + name="scroll_content_panel" + follows="left|top|right" + min_height="300" layout="topleft" - left="10" - right="-10" - top="30"> + top="0" + background_visible="false" + height="400" + left="0" + width="285"> <texture_picker + fallback_image="default_land_picture.j2c" enabled="false" follows="left|top|right" - height="150" + height="197" layout="topleft" - left="10" + left="11" name="pick_snapshot" - right="-10" - top="10" /> - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="10" - name="Name:"> - Name: - </text> - <text - type="string" - length="1" + top="10" + width="272" /> + <text_editor + allow_scroll="false" + bg_visible="false" follows="left|top|right" - height="20" + h_pad="0" + height="35" + width="280" layout="topleft" + font="SansSerifBig" + font.style="BOLD" left="10" + top_pad="10" name="pick_name" - right="-10" + read_only="true" text_color="white" - word_wrap="true"> - [name] - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="description_label" - v_pad="15" - valign="center"> - Description: - </text> - <text - type="string" - length="1" + v_pad="0" + value="[name]" + use_ellipses="true" /> + <text_editor + allow_scroll="false" + bg_visible="false" follows="left|top|right" - height="40" - layout="topleft" - left="10" - name="pick_desc" - right="-10" - text_color="white" - v_pad="15" - valign="center" - word_wrap="true"> - [description] - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" + h_pad="0" + height="25" layout="topleft" left="10" - name="description_label" - v_pad="15" - valign="bottom"> - Location: - </text> - <text - type="string" - length="1" - follows="left|top" - height="30" + name="pick_location" + read_only="true" + width="280" + word_wrap="true" + v_pad="0" + value="[loading...]" /> + <text_editor + bg_readonly_color="DkGray2" + follows="all" + height="100" + width="280" + parse_urls="true" + hide_scrollbar="false" layout="topleft" left="10" - name="pick_location" - text_color="white" - v_pad="15" - valign="center"> - [loading...] - </text> + top_pad="2" + max_length="1023" + name="pick_desc" + read_only="true" + text_readonly_color="white" + value="[description]" + wrap="true" /> </panel> + </scroll_container> <panel follows="left|right|bottom" - height="30" + height="35" layout="topleft" - left="10" - name="buttons" - right="-10" - top_pad="2"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit" - layout="topleft" - left="10" - name="edit_btn" - top="3" - width="50" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" - layout="topleft" - left="65" - name="teleport_btn" - top="3" - width="70" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Show on Map" - layout="topleft" - left="140" - name="show_on_map_btn" - top="3" - width="90" /> - <button - enabled="false" - follows="bottom|right" - font="SansSerifSmallBold" - height="25" - label="Verb" - layout="topleft" - left="270" - name="verb_btn" - top="3" - width="50" /> + top_pad="5" + left="8" + name="buttons"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="layout_stack1" + left="0" + orientation="horizontal" + top_pad="0" + width="312"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="layout_panel1" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + top="0" + width="101" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + width="100"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + top_pad="0" + width="100" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="101"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + name="edit_btn" + top_pad="0" + width="101" /> + </layout_panel> + </layout_stack> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml new file mode 100644 index 0000000000..43d580844f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bevel_style="none" + follows="top|left|right" + height="85" + layout="topleft" + left="0" + name="picture_item" + top="0" + width="313"> + <icon + follows="all" + height="85" + image_name="ListItem_Over" + right="-2" + mouse_opaque="false" + name="hovered_icon" + top="1" + scale_image="true" + visible="false" + width="308" /> + <icon + follows="all" + height="85" + image_name="ListItem_Select" + right="-2" + mouse_opaque="false" + name="selected_icon" + top="1" + scale_image="true" + visible="false" + width="308" /> + <texture_picker + allow_no_texture="true" + border_enabled="true" + fallback_image="default_land_picture.j2c" + enabled="false" + follows="left|top" + height="80" + layout="topleft" + left="10" + mouse_opaque="false" + name="picture" + tab_stop="false" + top="10" + top_pad="10" + width="90" /> + <text + follows="top|left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left="110" + name="picture_name" + parse_urls="false" + text_color="white" + top="9" + use_ellipses="true" + width="193" + word_wrap="false" /> + <expandable_text + follows="top|left|right" + font="SansSerifSmall" + height="55" + layout="topleft" + left="103" + name="picture_descr" + textbox.max_length="1024" + textbox.show_context_menu="false" + top_pad="0" + width="178" + word_wrap="true" /> + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" + layout="topleft" + left_pad="5" + right="-8" + name="info_chevron" + top_delta="24" + width="20" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 95055f43dc..978b204df9 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -1,173 +1,232 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" - bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" - height="690" +bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="all" + height="548" label="Picks" layout="topleft" left="0" name="panel_picks" top="0" - width="355"> - <text - type="string" - length="1" - follows="top|left|right" - font="SansSerifHugeBold" - height="55" + width="313"> + <string + name="no_picks" + value="No Picks" /> + <string + name="no_classifieds" + value="No Classifieds" /> + <text + type="string" + follows="all" + height="535" + layout="topleft" + left="6" + name="picks_panel_text" + wrap="true" + top="10" + width="313"/> + <accordion + fit_parent="true" + follows="all" + height="485" + layout="topleft" + left="0" + name="accordion" + top="0" + single_expansion="true" + width="313"> + <accordion_tab layout="topleft" - left="10" - name="pick_title" - text_color="white" - top="10" - width="330" - word_wrap="true"> - [NAME]'s favorite places in Second Life... - </text> - <!-- below is a special title shown for the Agent on the "Picks" tab--> - <text - type="string" - length="1" - follows="top" - font="SansSerifHugeBold" - height="55" - layout="topleft" - left="10" - name="pick_title_agent" - text_color="white" - top="10" - visible="false" - width="330" - word_wrap="true"> - Tell everyone about your favorite Second Life places... - </text> - <scroll_container - follows="left|top|right|bottom" - height="550" - layout="topleft" - left="5" - reserve_scroll_corner="true" - width="345"> - <panel - background_visible="true" - bevel_style="in" - bg_alpha_color="0.6 0.6 0.6 1" - follows="left|top|right|bottom" - height="600" + height="235" + min_height="150" + name="tab_picks" + title="Picks" + visible="false"> + <flat_list_view + color="DkGray2" + follows="all" layout="topleft" left="0" - name="back_panel" + name="picks_list" + opaque="true" top="0" - width="325" /> - </scroll_container> - <panel - background_visible="true" - bevel_style="in" - bg_alpha_color="black" - enabled="false" - follows="left|right|bottom" - height="25" - label="bottom_panel" + width="313" /> + </accordion_tab> + <accordion_tab layout="topleft" - left="5" - name="edit_panel" - visible="false" - width="345"> - <button + height="235" + name="tab_classifieds" + title="Classifieds" + visible="false"> + <flat_list_view + color="DkGray2" + follows="all" + layout="topleft" + left="0" + name="classifieds_list" + opaque="true" + top="0" + width="313" /> + </accordion_tab> + </accordion> + <panel +bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + bevel_style="none" enabled="false" - follows="bottom|left" - font="SansSerifBigBold" - height="16" - image_hover_selected="gear.tga" - image_selected="gear.tga" - image_unselected="gear.tga" - layout="topleft" - left="5" - name="gear_menu_btn" - picture_style="true" - top="5" - width="16" /> - <button - follows="bottom|left" - font="SansSerifBigBold" - height="16" - image_disabled="add_btn.tga" - image_disabled_selected="add_btn.tga" - image_hover_selected="add_btn.tga" - image_selected="add_btn.tga" - image_unselected="add_btn.tga" - layout="topleft" - left="35" - name="new_btn" - picture_style="true" - tool_tip="Create New Pick at Current Location" - top="5" - width="16" /> - <button - follows="bottom|right" - font="SansSerifBigBold" - height="16" - image_disabled="del_btn.tga" - image_disabled_selected="del_btn.tga" - image_hover_selected="del_btn.tga" - image_selected="del_btn.tga" - image_unselected="del_btn.tga" - layout="topleft" - name="trash_btn" - picture_style="true" - right="-10" - top="5" - width="16" /> - </panel> - <panel - follows="left|right" - height="25" - layout="topleft" - left="0" - name="buttons_cucks" - top_pad="10" - width="345"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Info" - layout="topleft" - left="10" - name="info_btn" - top="0" - width="50" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" + auto_resize="false" + follows="bottom|left|right" + left="1" + height="27" + label="bottom_panel" + layout="bottom" + name="edit_panel" + top_pad="-2" + width="313"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="bottomleft" + name="edit_panel_ls" + left="10" + orientation="horizontal" + top_pad="0" + width="293"> + + <layout_panel + follows="bottom|left" + height="18" + layout="bottomleft" + left="0" + name="gear_menu_btn" + user_resize="false" + auto_resize="true" + width="51"> + <button + follows="bottom|left" + height="18" + image_disabled="AddItem_Disabled" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + layout="topleft" + left="0" + name="new_btn" + tool_tip="Create a new pick or classified at the current location" + top="0" + width="18" /> + </layout_panel> + + <layout_panel + follows="bottom|right" + height="18" + layout="bottomleft" + name="trash_btn_lp" + user_resize="false" + auto_resize="true" + width="18"> + <button + follows="bottom|right" + height="18" + image_disabled="TrashItem_Disabled" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + name="trash_btn" + top="0" + width="18" /> + </layout_panel> + + </layout_stack> + </panel> + + <panel + bg_opaque_color="DkGray" + background_visible="true" + background_opaque="true" + follows="bottom|left|right" layout="topleft" - left="65" - name="teleport_btn" - top="0" - width="70" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Show on Map" - layout="topleft" - left="140" - name="show_on_map_btn" - top="0" - width="90" /> - <button - enabled="false" - follows="bottom|right" - font="SansSerifSmallBold" - height="25" - label="Verb" - layout="topleft" - left="270" - name="verb_btn" - top="0" - width="50" /> - </panel> + left="0" + height="40" + name="buttons_cucks" + width="313"> + + <layout_stack + follows="bottom|left|right" + height="28" + layout="topleft" + left="2" + name="buttons_cucks_ls" + orientation="horizontal" + top="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="topleft" + left="0" + name="info_btn_lp" + user_resize="false" + auto_resize="true" + top="0" + width="95"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Info" + layout="topleft" + name="info_btn" + tab_stop="false" + tool_tip="Show pick information" + width="95" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="bottomleft" + left_pad="2" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="117"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport_btn" + tab_stop="false" + tool_tip="Teleport to the corresponding area" + width="117" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="28" + layout="bottomleft" + name="show_on_map_btn_lp" + user_resize="false" + auto_resize="true" + left_pad="2" + width="90"> + <button + enabled="false" + follows="top|left|right" + height="23" + label="Map" + layout="topleft" + name="show_on_map_btn" + tab_stop="false" + tool_tip="Show the corresponding area on the World Map" + width="88" /> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml new file mode 100644 index 0000000000..01d1e48ba1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -0,0 +1,963 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="610" + layout="topleft" + left="0" + min_height="350" + name="place_profile" + top="20" + width="333"> + <string + name="on" + value="On" /> + <string + name="off" + value="Off" /> + <string + name="anyone" + value="Anyone" /> + <string + name="available" + value="available" /> + <string + name="allocated" + value="allocated" /> + <string + name="title_place" + value="Place Profile" /> + <string + name="title_teleport_history" + value="Teleport History" /> + <string + name="not_available" + value="(N\A)" /> + <string + name="unknown" + value="(unknown)" /> + <string + name="public" + value="(public)" /> + <string + name="none_text" + value="(none)" /> + <string + name="sale_pending_text" + value="(Sale Pending)" /> + <string + name="group_owned_text" + value="(Group Owned)" /> + <string + name="price_text" + value="L$" /> + <string + name="area_text" + value="m²" /> + <string + name="all_residents_text" + value="All Residents" /> + <string + name="group_text" + value="Group" /> + <string + name="can_resell"> + Purchased land in this region may be resold. + </string> + <string + name="can_not_resell"> + Purchased land in this region may not be resold. + </string> + <string + name="can_change"> + Purchased land in this region may be joined or subdivided. + </string> + <string + name="can_not_change"> + Purchased land in this region may not be joined or subdivided. + </string> + <string + name="server_update_text"> + Place information not available without server update. + </string> + <string + name="server_error_text"> + Information about this location is unavailable at this time, please try again later. + </string> + <string + name="server_forbidden_text"> + Information about this location is unavailable due to access restrictions. Please check your permissions with the parcel owner. + </string> + <string + name="acquired_date"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </string> + <!-- Texture names for parcel permissions icons --> + <string + name="icon_PG" + translate="false" + value="Parcel_PG_Dark" /> + <string + name="icon_M" + translate="false" + value="Parcel_M_Dark" /> + <string + name="icon_R" + translate="false" + value="Parcel_R_Dark" /> + <string + name="icon_Voice" + translate="false" + value="Parcel_Voice_Dark" /> + <string + name="icon_VoiceNo" + translate="false" + value="Parcel_VoiceNo_Dark" /> + <string + name="icon_Fly" + translate="false" + value="Parcel_Fly_Dark" /> + <string + name="icon_FlyNo" + translate="false" + value="Parcel_FlyNo_Dark" /> + <string + name="icon_Push" + translate="false" + value="Parcel_Push_Dark" /> + <string + name="icon_PushNo" + translate="false" + value="Parcel_PushNo_Dark" /> + <string + name="icon_Build" + translate="false" + value="Parcel_Build_Dark" /> + <string + name="icon_BuildNo" + translate="false" + value="Parcel_BuildNo_Dark" /> + <string + name="icon_Scripts" + translate="false" + value="Parcel_Scripts_Dark" /> + <string + name="icon_ScriptsNo" + translate="false" + value="Parcel_ScriptsNo_Dark" /> + <string + name="icon_Damage" + translate="false" + value="Parcel_Damage_Dark" /> + <string + name="icon_DamageNo" + translate="false" + value="Parcel_DamageNo_Dark" /> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + left="8" + name="back_btn" + tool_tip="Back" + tab_stop="false" + top="4" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="10" + name="title" + text_color="LtGray" + top="4" + use_ellipses="true" + value="Place Profile" + width="280" /> + <scroll_container + color="DkGray2" + follows="all" + height="572" + layout="topleft" + left="9" + name="place_scroll" + opaque="true" + top_pad="10" + width="310"> + <panel + bg_alpha_color="DkGray2" + follows="left|top|right" + height="580" + layout="topleft" + left="0" + min_height="300" + name="scrolling_panel" + top="0" + width="310"> + <texture_picker + enabled="false" + fallback_image="default_land_picture.j2c" + follows="left|top|right" + height="197" + layout="topleft" + left="11" + name="logo" + top="10" + width="290" /> + <layout_stack + border_size="0" + clip="false" + follows="left|top|right" + height="50" + layout="topleft" + mouse_opaque="false" + name="panel_stack" + orientation="horizontal" + top_pad="-65" + width="100"> + <layout_panel + follows="left|right" + height="50" + layout="topleft" + left="0" + min_height="50" + min_width="50" + mouse_opaque="false" + name="here_panel" + top="0" + user_resize="false" + width="60"> + <icon + follows="top|left" + height="50" + image_name="YouAreHere_Badge" + layout="topleft" + left="0" + name="icon_you_are_here" + top="0" + width="50" /> + </layout_panel> + <layout_panel + follows="left|right" + height="60" + layout="topleft" + min_height="50" + min_width="60" + mouse_opaque="false" + name="for_sale_panel" + top="0" + user_resize="false" + width="60"> + <icon + follows="top|left" + height="50" + image_name="ForSale_Badge" + layout="topleft" + left="10" + name="icon_for_sale" + top="0" + width="50" /> + </layout_panel> + </layout_stack> + <text + parse_urls="false" + follows="left|top|right" + font="SansSerifLarge" + height="14" + layout="topleft" + left="10" + name="region_title" + text_color="white" + top_pad="5" + use_ellipses="true" + value="SampleRegion" + width="290" /> + <text + parse_urls="false" + follows="left|top|right" + height="14" + layout="topleft" + left="10" + name="parcel_title" + top_pad="4" + use_ellipses="true" + value="SampleParcel, Name Long (145, 228, 26)" + width="285" /> + <expandable_text + follows="left|top|right" + height="50" + layout="topleft" + left="5" + name="description" + top_pad="10" + value="Du waltz die spritz" + width="300" /> + <text + follows="left|top" + height="14" + layout="topleft" + left="10" + name="owner_label" + text_color="White" + top_pad="0" + value="Owner:" + width="90" /> + <!--TODO: HOOK THIS NAME UP WITH AN INSPECTOR --> + <text + follows="left|top|right" + height="14" + layout="topleft" + left_pad="1" + name="owner_value" + top_delta="0" + value="Alex Superduperlongenamenton" + width="205" /> + <icon + follows="top|left" + height="16" + image_name="unknown" + layout="topleft" + left="10" + name="maturity_icon" + top_delta="0" + width="18" /> + <text + follows="left|top|right" + height="16" + layout="topleft" + left_pad="8" + name="maturity_value" + top_delta="0" + value="unknown" + width="268" /> + <accordion + fit_parent="true" + follows="all" + height="268" + layout="topleft" + single_expansion="true" + left="0" + name="advanced_info_accordion" + top_pad="5" + width="313"> + <accordion_tab + fit_panel="false" + height="175" + layout="topleft" + name="parcel_characteristics_tab" + title="Parcel"> + <panel + follows="all" + height="175" + layout="topleft" + left="0" + name="parcel_characteristics_panel" + top="0" + width="275"> + <icon + follows="top|left" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left="10" + name="rating_icon" + top="0" + width="18" /> + <text + follows="left|top" + height="16" + layout="topleft" + left_pad="12" + name="rating_label" + value="Rating:" + width="90" /> + <text + follows="left|right|top" + height="16" + layout="topleft" + left_pad="0" + name="rating_value" + top_delta="0" + value="unknown" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Voice_Dark" + layout="topleft" + left="10" + name="voice_icon" + top_pad="5" + width="22" /> + <text + follows="left|top" + height="18" + layout="topleft" + left_pad="8" + name="voice_label" + top_delta="0" + value="Voice:" + width="90" /> + <text + follows="left|right|top" + height="18" + layout="topleft" + left_pad="0" + name="voice_value" + top_delta="0" + value="On" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Fly_Dark" + layout="topleft" + left="10" + name="fly_icon" + top_pad="3" + width="22" /> + <text + follows="left|top" + height="16" + layout="topleft" + left_pad="8" + name="fly_label" + value="Fly:" + width="90" /> + <text + follows="left|right|top" + height="16" + layout="topleft" + left_pad="0" + name="fly_value" + top_delta="0" + value="On" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Push_Dark" + layout="topleft" + left="10" + name="push_icon" + top_pad="3" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="push_label" + value="Push:" + width="90" /> + <text + follows="left|right|top" + height="14" + layout="topleft" + left_pad="0" + name="push_value" + top_delta="0" + value="Off" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Build_Dark" + layout="topleft" + left="10" + name="build_icon" + top_pad="3" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="build_label" + value="Build:" + width="90" /> + <text + follows="left|right|top" + height="15" + layout="topleft" + left_pad="0" + name="build_value" + top_delta="0" + value="On" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Scripts_Dark" + layout="topleft" + left="10" + name="scripts_icon" + top_pad="3" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="scripts_label" + value="Scripts:" + width="90" /> + <text + follows="left|right|top" + height="14" + layout="topleft" + left_pad="0" + name="scripts_value" + top_delta="0" + value="On" + width="60" /> + <icon + follows="top|left" + height="18" + image_name="Parcel_Damage_Dark" + layout="topleft" + left="10" + name="damage_icon" + top_pad="7" + width="22" /> + <text + follows="left|top" + height="14" + layout="topleft" + left_pad="8" + name="damage_label" + value="Damage:" + width="90" /> + <text + follows="left|right|top" + height="14" + layout="topleft" + left_pad="0" + name="damage_value" + top_delta="0" + value="Off" + width="60" /> + <button + follows="bottom|right" + height="23" + label="About Land" + layout="topleft" + name="about_land_btn" + right="-5" + tab_stop="false" + top_pad="2" + width="140"> + <click_callback + function="Floater.Show" + parameter="about_land" /> + </button> + </panel> + </accordion_tab> + <accordion_tab + expanded="false" + fit_panel="false" + height="125" + layout="topleft" + name="region_information_tab" + title="Region"> + <panel + follows="all" + height="125" + layout="topleft" + left="0" + name="region_information_panel" + top="0" + width="290"> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="region_name_label" + top_pad="5" + value="Region:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="region_name" + top_delta="0" + value="Mooseland" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="region_type_label" + top_pad="5" + value="Type:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="region_type" + top_delta="0" + value="Moose" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="region_rating_label" + top_pad="7" + value="Rating:" + width="90" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left_pad="0" + name="region_rating_icon" + width="18" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="10" + name="region_rating" + value="Adult" + width="159" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="region_owner_label" + top_pad="5" + value="Owner:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="region_owner" + top_delta="0" + value="moose Van Moose" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="region_group_label" + top_pad="5" + value="Group:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="region_group" + top_delta="0" + use_ellipses="true" + width="187"> + The Mighty Moose of mooseville soundvillemoose + </text> + <button + follows="bottom|right" + height="23" + label="Region/Estate" + layout="topleft" + name="region_info_btn" + right="-5" + tab_stop="false" + top_pad="2" + width="180"> + <click_callback + function="Floater.Show" + parameter="region_info" /> + </button> + </panel> + </accordion_tab> + <accordion_tab + expanded="false" + fit_panel="false" + height="180" + layout="topleft" + name="estate_information_tab" + title="Estate"> + <panel + follows="all" + height="180" + layout="topleft" + left="0" + name="estate_information_panel" + top="0" + width="290"> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="estate_name_label" + top_pad="5" + value="Estate:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="estate_name" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="estate_rating_label" + top_pad="5" + value="Rating:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="estate_rating" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="estate_owner_label" + top_pad="5" + value="Owner:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="estate_owner" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="covenant_label" + top_pad="5" + value="Covenant:" + width="277" /> + <text_editor + bg_focus_color="DkGray2" + bg_readonly_color="DkGray2" + follows="left|top|right" + height="90" + layout="topleft" + left="10" + max_length="65535" + name="covenant" + read_only="true" + top_pad="0" + width="277" + word_wrap="true" /> + </panel> + </accordion_tab> + <accordion_tab + expanded="false" + fit_panel="false" + height="290" + layout="topleft" + name="sales_tab" + title="For Sale"> + <panel + follows="all" + height="290" + layout="topleft" + left="0" + name="sales_panel" + top="0" + width="290"> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="sales_price_label" + top_pad="5" + value="Price:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="sales_price" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="area_label" + top_pad="5" + value="Area:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="area" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="traffic_label" + top_pad="5" + value="Traffic:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="traffic" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="primitives_label" + top_pad="5" + value="Primitives:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="primitives" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="parcel_scripts_label" + top_pad="5" + value="Scripts:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="parcel_scripts" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="terraform_limits_label" + top_pad="5" + value="Terraform limits:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="terraform_limits" + top_delta="0" + width="187" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="subdivide_label" + top_pad="5" + value="Subdivide/Join ability:" + width="277" /> + <text_editor + bg_focus_color="DkGray2" + bg_readonly_color="DkGray2" + follows="left|top|right" + height="45" + layout="topleft" + left="10" + max_length="65535" + name="subdivide" + read_only="true" + top_pad="5" + width="277" + word_wrap="true" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="resale_label" + top_pad="5" + value="ReSale ability:" + width="277" /> + <text_editor + bg_focus_color="DkGray2" + bg_readonly_color="DkGray2" + follows="left|top|right" + height="45" + layout="topleft" + left="10" + max_length="65535" + name="resale" + read_only="true" + top_pad="5" + width="277" + word_wrap="true" /> + <text + follows="left|top" + height="15" + layout="topleft" + left="10" + name="sale_to_label" + top_pad="5" + value="For sale to:" + width="90" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="0" + name="sale_to" + top_delta="0" + width="187" /> + </panel> + </accordion_tab> + </accordion> + </panel> + </scroll_container> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 66bb38b45e..21314703b0 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -1,86 +1,364 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" - follows="left|top|right|bottom" - height="400" +background_visible="true" + default_tab_group="1" + follows="all" + height="570" label="Places" layout="topleft" - left="0" min_height="350" - min_width="240" name="places panel" - top="400" - width="355"> - <search_editor + top="0" + left="0" + width="333"> + <string + name="landmarks_tab_title" + value="MY LANDMARKS" /> + <string + name="teleport_history_tab_title" + value="TELEPORT HISTORY" /> + <filter_editor + text_pad_left="10" follows="left|top|right" - height="16" - label="Filter" + font="SansSerifSmall" + height="23" layout="topleft" left="10" + label="Filter My Places" + max_length="300" name="Filter" - top="4" - width="335" /> + top="3" + width="303" /> <tab_container - follows="left|top|right|bottom" - height="326" + follows="all" + halign="center" + height="503" layout="topleft" - left_delta="0" + left="6" name="Places Tabs" + tab_min_width="80" + tab_max_width="157" + tab_height="30" + tab_group="1" tab_position="top" - top_pad="19" - width="335" /> + top_pad="10" + width="315" /> + <panel + class="panel_place_profile" + filename="panel_place_profile.xml" + follows="all" + height="533" + layout="topleft" + left="0" + help_topic="place_profile" + name="panel_place_profile" + top="5" + visible="false" + width="315" /> <panel class="panel_landmark_info" filename="panel_landmark_info.xml" - follows="left|top|right|bottom" - height="675" + follows="all" + height="533" layout="topleft" left="0" + help_topic="landmark" name="panel_landmark_info" - top="-310" + top="5" visible="false" - width="355" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="TELEPORT" - layout="topleft" - left_delta="10" - name="teleport_btn" - top_pad="5" - width="90" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="SHOW ON MAP" - layout="topleft" - left_pad="5" - name="map_btn" - top_delta="0" - width="110" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="SHARE" - layout="topleft" - left_pad="5" - name="share_btn" - top_delta="0" - width="60" /> - <button - enabled="false" - follows="bottom|right" - font="SansSerifSmallBold" - height="25" - label="▼" + width="315" /> + <panel + follows="bottom|left|right" + height="23" layout="topleft" - left_pad="35" - name="overflow_btn" - top_delta="0" - width="30" /> + left="4" + name="button_panel" + width="315"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls0" + left="4" + orientation="horizontal" + top="0" + width="315"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="lp1" + user_resize="false" + auto_resize="true" + width="193"> + + <!--*********************** Teleport, Map buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls1" + left="0" + orientation="horizontal" + top="0" + width="193"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="teleport_btn_lp" + user_resize="false" + auto_resize="true" + width="109"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="1" + name="teleport_btn" + tool_tip="Teleport to the selected area" + top="0" + width="108" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="86"> + <button + follows="bottom|left|right" + height="23" + label="Map" + layout="topleft" + left="1" + name="map_btn" + tool_tip="Show the corresponding area on the World Map" + top="0" + width="85" /> + </layout_panel> + </layout_stack> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="lp2" + user_resize="false" + auto_resize="true" + width="116"> + + <!--*********************** Edit, Options buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="edit_btn_lp" + user_resize="false" + auto_resize="true" + width="84"> + <button + follows="bottom|left|right" + height="23" + label="Edit" + layout="topleft" + left="1" + mouse_opaque="false" + name="edit_btn" + tool_tip="Edit landmark information" + top="0" + width="83" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="0" + mouse_opaque="false" + name="overflow_btn_lp" + user_resize="false" + auto_resize="true" + width="24"> + <button + follows="bottom|left|right" + height="23" + label="▼" + layout="topleft" + mouse_opaque="false" + name="overflow_btn" + tool_tip="Show additional options" + top="0" + left="1" + width="23" /> + </layout_panel> + </layout_stack> + + <!--*********************** Profile button ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="profile_btn_lp" + user_resize="false" + auto_resize="true" + width="112"> + <button + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + mouse_opaque="false" + name="profile_btn" + left="1" + tool_tip="Show place profile" + top="0" + width="111" /> + </layout_panel> + </layout_stack> + + <!--*********************** Close button ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_close_ls3" + left="0" + orientation="horizontal" + top="0" + width="120"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="close_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="61"> + <button + follows="bottom|left|right" + height="23" + label="Close" + layout="topleft" + mouse_opaque="false" + name="close_btn" + left="1" + top="0" + width="60" /> + </layout_panel> + </layout_stack> + + + </layout_panel> + </layout_stack> + +<!--*********************** Save, Cancel buttons ***********************--> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="bottom_bar_ls2" + left="4" + orientation="horizontal" + top="0" + width="313"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="save_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="153"> + <button + follows="bottom|left|right" + height="23" + label="Save" + layout="topleft" + mouse_opaque="false" + name="save_btn" + left="1" + top_pad="0" + width="152"/> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="cancel_btn_lp" + top="0" + user_resize="false" + auto_resize="true" + width="154"> + <button + follows="bottom|left|right" + height="23" + label="Cancel" + layout="topleft" + mouse_opaque="false" + name="cancel_btn" + left="1" + top="0" + width="153" /> + </layout_panel> + </layout_stack> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml new file mode 100644 index 0000000000..31d8ea27d9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -0,0 +1,324 @@ +<?xml version="1.0" encoding="UTF-8"?> +<panel + border="true" + follows="all" + height="408" + label="Advanced" + layout="topleft" + left="102" + name="advanced" + top="1" + width="517"> + <panel.string + name="aspect_ratio_text"> + [NUM]:[DEN] + </panel.string> + <panel.string + name="middle_mouse"> + Middle Mouse + </panel.string> + <icon + follows="left|top" + height="18" + image_name="Cam_FreeCam_Off" + layout="topleft" + name="camera_icon" + mouse_opaque="false" + visible="true" + width="18" + left="30" + top="10"/> + <slider + can_edit_text="true" + control_name="CameraAngle" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.025" + initial_value="1.57" + layout="topleft" + label_width="100" + label="View angle" + left_pad="30" + max_val="2.97" + min_val="0.17" + name="camera_fov" + show_text="false" + width="240" /> + <slider + can_edit_text="true" + control_name="CameraOffsetScale" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.025" + initial_value="1" + layout="topleft" + label="Distance" + left_delta="0" + label_width="100" + max_val="3" + min_val="0.5" + name="camera_offset_scale" + show_text="false" + width="240" + top_pad="5"/> + <text + follows="left|top" + type="string" + length="1" + height="10" + left="80" + name="heading2" + width="270" + top_pad="5"> +Automatic position for: + </text> + <check_box + control_name="EditCameraMovement" + height="20" + follows="left|top" + label="Build/Edit" + layout="topleft" + left_delta="30" + name="edit_camera_movement" + tool_tip="Use automatic camera positioning when entering and exiting edit mode" + width="280" + top_pad="5" /> + <check_box + control_name="AppearanceCameraMovement" + follows="left|top" + height="16" + label="Appearance" + layout="topleft" + name="appearance_camera_movement" + tool_tip="Use automatic camera positioning while in edit mode" + width="242" /> + <check_box + control_name="SidebarCameraMovement" + follows="left|top" + height="16" + initial_value="true" + label="Sidebar" + layout="topleft" + name="appearance_sidebar_positioning" + tool_tip="Use automatic camera positioning for sidebar" + width="242" /> + <icon + follows="left|top" + height="18" + image_name="Move_Walk_Off" + layout="topleft" + name="avatar_icon" + mouse_opaque="false" + visible="true" + width="18" + top_pad="2" + left="30" + /> + <check_box + control_name="FirstPersonAvatarVisible" + follows="left|top" + height="20" + label="Show me in Mouselook" + layout="topleft" + left_pad="30" + name="first_person_avatar_visible" + width="256" /> + <check_box + control_name="ArrowKeysAlwaysMove" + follows="left|top" + height="20" + label="Arrow keys always move me" + layout="topleft" + left_delta="0" + name="arrow_keys_move_avatar_check" + width="237" + top_pad="0"/> + <check_box + control_name="AllowTapTapHoldRun" + follows="left|top" + height="20" + label="Tap-tap-hold to run" + layout="topleft" + left_delta="0" + name="tap_tap_hold_to_run" + width="237" + top_pad="0"/> + <check_box + control_name="LipSyncEnabled" + follows="left|top" + height="20" + label="Move avatar lips when speaking" + layout="topleft" + left_delta="0" + name="enable_lip_sync" + width="237" + top_pad="0" /> + <check_box + control_name="UseChatBubbles" + follows="left|top" + height="16" + label="Bubble chat" + layout="topleft" + left="78" + top_pad="6" + name="bubble_text_chat" + width="150" /> + <slider + control_name="ChatBubbleOpacity" + follows="left|top" + height="16" + increment="0.05" + initial_value="1" + label="Opacity" + layout="topleft" + left="80" + label_width="156" + name="bubble_chat_opacity" + top_pad = "10" + width="347" /> + <color_swatch + can_apply_immediately="true" + color="0 0 0 1" + control_name="BackgroundChatColor" + follows="left|top" + height="50" + layout="topleft" + left_pad="30" + top="190" + name="background" + tool_tip="Choose color for bubble chat" + width="38"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="BackgroundChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="BackgroundChatColor" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="80" + name="UI Size:" + top_pad="25" + width="160"> + UI size + </text> + <slider + control_name="UIScaleFactor" + decimal_digits="2" + follows="left|top" + height="17" + increment="0.025" + initial_value="1" + layout="topleft" + left_pad="0" + max_val="1.4" + min_val="0.75" + name="ui_scale_slider" + top_pad="-14" + width="180" /> + <check_box + control_name="ShowScriptErrors" + follows="left|top" + height="20" + label="Show script errors in:" + layout="topleft" + left="30" + top_pad="10" + name="show_script_errors" + width="256" /> + <radio_group + enabled_control="ShowScriptErrors" + control_name="ShowScriptErrorsLocation" + follows="top|left" + draw_border="false" + height="16" + layout="topleft" + left_delta="50" + name="show_location" + top_pad="5" + width="364"> + <radio_item + height="16" + label="Nearby chat" + layout="topleft" + left="3" + name="0" + top="0" + width="315" /> + <radio_item + height="16" + label="Separate window" + layout="topleft" + left_delta="175" + name="1" + top_delta="0" + width="315" /> + </radio_group> + <check_box + follows="top|left" + enabled_control="EnableVoiceChat" + control_name="PushToTalkToggle" + height="15" + label="Toggle speak on/off when I press:" + layout="topleft" + left="30" + name="push_to_talk_toggle_check" + width="237" + tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/> + <line_editor + follows="top|left" + control_name="PushToTalkButton" + enabled="false" + enabled_control="EnableVoiceChat" + height="23" + left="80" + max_length="200" + name="modifier_combo" + label="Push-to-Speak trigger" + top_pad="5" + width="200" /> + <button + layout="topleft" + follows="top|left" + enabled_control="EnableVoiceChat" + height="23" + label="Set Key" + left_pad="5" + name="set_voice_hotkey_button" + width="100"> + <button.commit_callback + function="Pref.VoiceSetKey" /> + </button> + <button + enabled_control="EnableVoiceChat" + follows="top|left" + halign="center" + height="23" + image_overlay="Refresh_Off" + tool_tip="Reset to Middle Mouse Button" + mouse_opaque="true" + name="set_voice_middlemouse_button" + left_pad="5" + width="25"> + <button.commit_callback + function="Pref.VoiceSetMiddleMouse" /> + </button> + <button + height="23" + label="Other Devices" + left="30" + name="joystick_setup_button" + top="27" + width="155"> + <button.commit_callback + function="Floater.Show" + parameter="pref_joystick" /> + </button> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml new file mode 100644 index 0000000000..559df5bec9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + height="408" + label="Popups" + layout="topleft" + left="0" + name="popups" + top="500" + width="517"> + <text + type="string" + length="1" + follows="top|left" + height="12" + layout="topleft" + left="10" + name="tell_me_label" + top="10" + width="300"> + Tell me: + </text> + <check_box + control_name="NotifyMoneyChange" + height="16" + label="When I spend or get L$" + layout="topleft" + left_delta="50" + name="notify_money_change_checkbox" + top_pad="4" + width="300" /> + <check_box + control_name="ChatOnlineNotification" + height="16" + label="When my friends log in or out" + layout="topleft" + left_delta="0" + name="friends_online_notify_checkbox" + top_pad="4" + width="300" /> + <text + type="string" + length="1" + follows="top|left" + height="12" + layout="topleft" + left="10" + name="show_label" + top_pad="8" + width="450"> + Always show: + </text> + <scroll_list + follows="top|left|right" + height="140" + layout="topleft" + left="10" + multi_select="true" + name="enabled_popups" + sort_column="0" + sort_ascending="true" + width="495" /> + <button + enabled_control="FirstSelectedDisabledPopups" + follows="top|left" + height="23" + image_overlay="Arrow_Up" + hover_glow_amount="0.15" + layout="topleft" + left="180" + name="enable_this_popup" + top_pad="5" + width="40"> + <button.commit_callback + function="Pref.ClickEnablePopup" /> + </button> + <button + enabled_control="FirstSelectedEnabledPopups" + follows="top|left" + height="23" + image_overlay="Arrow_Down" + hover_glow_amount="0.15" + layout="topleft" + left_pad="40" + name="disable_this_popup" + top_delta="0" + width="40"> + <button.commit_callback + function="Pref.ClickDisablePopup" /> + </button> + <text + type="string" + length="1" + follows="top|left" + height="12" + layout="topleft" + left="10" + name="dont_show_label" + top_pad="-10" + width="450"> + Never show: + </text> + <scroll_list + follows="top|left|right" + height="140" + layout="topleft" + left="10" + sort_column="0" + sort_ascending="true" + multi_select="true" + name="disabled_popups" + width="495" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index bda437ab29..31e160ec33 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -9,237 +9,262 @@ name="chat" top="1" width="517"> - <text - type="string" - length="1" - follows="left|top" - height="10" - layout="topleft" - left="12" - mouse_opaque="false" - top="10" - width="128"> - Chat Font Size: - </text> - <radio_group + <text + follows="left|top" + layout="topleft" + left="30" + height="12" + name="font_size" + width="120" + top="10"> + Font size: + </text> + <radio_group height="30" layout="topleft" - left_pad="8" - control_name="ChatFontSize" + left="40" + control_name="ChatFontSize" name="chat_font_size" - top_delta="0" - width="331"> + top_pad="0" + width="440"> <radio_item height="16" label="Small" layout="topleft" left="0" name="radio" - top="8" - width="98" /> + value="0" + top="10" + width="125" /> <radio_item height="16" label="Medium" layout="topleft" - left_pad="12" + left_delta="145" name="radio2" + value="1" top_delta="0" - width="98" /> + width="125" /> <radio_item height="16" label="Large" layout="topleft" - left_pad="12" + left_delta="170" name="radio3" + value="2" top_delta="0" - width="98" /> + width="125" /> </radio_group> + + <text + follows="left|top" + layout="topleft" + left="30" + height="12" + name="font_colors" + top_pad="10" + width="120" + > + Font colors: + </text> + + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="47" + layout="topleft" + left="40" + name="user" + top_pad="10" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="UserChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="UserChatColor" /> + </color_swatch> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left="12" + left_pad="5" mouse_opaque="false" - name="text_box2" - top="54" - width="128"> - Chat Color: + name="text_box1" + top_delta="5" + width="95"> + Me </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" - control_name="UserChatColor" follows="left|top" height="47" - label="You" layout="topleft" - left_pad="8" - name="user" - top_delta="-1" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - control_name="AgentChatColor" + left="190" + name="agent" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="AgentChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="AgentChatColor" /> + </color_swatch> + <text + type="string" + length="1" follows="left|top" - height="47" - label="Others" + height="10" layout="topleft" - left_pad="10" - name="agent" - top_delta="0" - width="44" /> + left_pad="5" + mouse_opaque="false" + name="text_box2" + top_delta="5" + width="95"> + Others + </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" - color="0.6 0.6 1 1" - control_name="IMChatColor" + color="LtGray" follows="left|top" height="47" - label="IM" label_width="60" layout="topleft" - left_pad="10" + left="360" name="im" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0.8 1 1 1" - control_name="SystemChatColor" - follows="left|top" - height="47" - label="System" - label_width="44" - layout="topleft" - left_pad="10" - name="system" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0.82 0.82 0.99 1" - control_name="ScriptErrorColor" - follows="left|top" - height="47" - label="Errors" - layout="topleft" - left_pad="10" - name="script_error" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0.7 0.9 0.7 1" - control_name="ObjectChatColor" + top_pad="-15" + width="44"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="IMChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="IMChatColor" /> + </color_swatch> + <text + type="string" + length="1" follows="left|top" - height="47" - label="Objects" + height="10" layout="topleft" - left="148" - name="objects" - top="103" - width="44" /> + left_pad="5" + mouse_opaque="false" + name="text_box3" + top_delta="5" + width="95"> + IM + </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" - color="0.7 0.9 0.7 1" - control_name="llOwnerSayChatColor" + color="LtGray" follows="left|top" height="47" - label="Owner" + label_width="44" layout="topleft" - left_pad="10" - name="owner" - top_delta="0" - width="44" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - can_apply_immediately="true" - color="0 0 0 1" - control_name="BackgroundChatColor" + left="40" + name="system" + top_pad="22" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="SystemChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="SystemChatColor" /> + </color_swatch> + <text + type="string" + length="1" follows="left|top" - height="47" - label="Bubble" + height="10" layout="topleft" - left_pad="10" - name="background" - top_delta="0" - width="44" /> + left_pad="5" + mouse_opaque="false" + name="text_box4" + top_delta="5" + width="95"> + System + </text> <color_swatch - border_color="0.45098 0.517647 0.607843 1" can_apply_immediately="true" - color="0.6 0.6 1 1" - control_name="HTMLLinkColor" + color="Red" follows="left|top" height="47" - label="URLs" layout="topleft" - left_pad="10" - name="links" - top_delta="0" - width="44" /> + left="190" + name="script_error" + top_pad="-15" + width="44"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="ScriptErrorColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="ScriptErrorColor" /> + </color_swatch> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left="12" + left_pad="5" mouse_opaque="false" - name="text_box3" - top="168" - width="135"> - Chat Console: + name="text_box5" + top_delta="5" + width="95"> + Errors </text> - <spinner - control_name="ChatPersistTime" - decimal_digits="0" + <color_swatch + can_apply_immediately="true" + color="EmphasisColor_35" follows="left|top" - height="16" - increment="1" - initial_value="10" - label="Fade chat after" - label_width="80" + height="47" layout="topleft" - left_pad="1" - max_val="60" - min_val="2" - name="fade_chat_time" - top_delta="2" - width="130" /> + left="360" + name="objects" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="ObjectChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="ObjectChatColor" /> + </color_swatch> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left_pad="4" + left_pad="5" mouse_opaque="false" - name="text_box4" - top_delta="0" - width="80"> - (seconds) + name="text_box6" + top_delta="5" + width="95"> + Objects </text> - <spinner - control_name="ConsoleMaxLines" - decimal_digits="0" + <color_swatch + can_apply_immediately="true" + color="LtYellow" follows="left|top" - height="16" - increment="1" - initial_value="10" + height="47" layout="topleft" - left_delta="58" - max_val="50" - min_val="1" - name="max_chat_count" - top_delta="0" - width="60" /> + left="40" + name="owner" + top_pad="22" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="llOwnerSayChatColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="llOwnerSayChatColor" /> + </color_swatch> <text type="string" length="1" @@ -248,123 +273,219 @@ layout="topleft" left_pad="5" mouse_opaque="false" - name="text_box5" - top_delta="0" - width="60"> - (# lines) + name="text_box7" + top_delta="5" + width="95"> + Owner </text> - <slider - control_name="ConsoleBackgroundOpacity" + <color_swatch + can_apply_immediately="true" + color="EmphasisColor" follows="left|top" - height="12" - increment="0.05" - initial_value="1" - label="Opacity" - layout="topleft" - left="148" - name="console_opacity" - top="193" - width="200" /> - <check_box - control_name="ChatFullWidth" - height="16" - label="Use full screen width (Requires restart)" + height="47" layout="topleft" - left_delta="0" - name="chat_full_width_check" - top_pad="9" - width="239" /> + left="190" + name="links" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="HTMLLinkColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="HTMLLinkColor" /> + </color_swatch> <text type="string" length="1" follows="left|top" height="10" layout="topleft" - left="12" + left_pad="5" mouse_opaque="false" - name="text_box6" - top="245" - width="135"> - Chat Options: + name="text_box9" + top_delta="5" + width="95"> + URLs </text> <check_box - control_name="CloseChatOnReturn" - height="16" - label="Close chat bar after hitting return" - layout="topleft" - left_pad="1" - name="close_chat_on_return_check" - top_delta="2" - width="237" /> - <check_box - control_name="ArrowKeysMoveAvatar" - height="16" - label="Arrow keys always move avatar when chatting" - layout="topleft" - left_delta="0" - name="arrow_keys_move_avatar_check" - top_pad="4" - width="237" /> - <check_box - control_name="ChatShowTimestamps" + control_name="PlayTypingAnim" height="16" - label="Show timestamps in Local Chat" + initial_value="true" + label="Play typing animation when chatting" layout="topleft" - left_delta="0" - name="show_timestamps_check" - top_pad="4" - width="237" /> + left="30" + name="play_typing_animation" + top_pad="32" + width="400" /> <check_box - control_name="ScriptErrorsAsChat" + enabled="false" height="16" - label="Show script errors and warnings as regular chat" + label="Email me IMs when I'm offline" layout="topleft" left_delta="0" - name="script_errors_as_chat" - top_pad="4" - width="275" /> + name="send_im_to_email" + top_pad="5" + width="400" /> <check_box - control_name="PlayTypingAnim" + enabled="false" height="16" - initial_value="true" - label="Play typing animation when chatting" + label="Enable plain text IM and chat history" layout="topleft" left_delta="0" - name="play_typing_animation" - top_pad="4" - width="237" /> + name="plain_text_chat_history" + top_pad="5" + width="400" /> <text - type="string" - length="1" + name="show_ims_in_label" follows="left|top" - height="10" layout="topleft" - left="12" - mouse_opaque="false" - name="text_box7" - top="359" - width="128"> - Bubble Chat: + left="30" + height="20" + width="170" + top_pad="14"> + Show IMs in: </text> + <text + name="requires_restart_label" + follows="left|top" + layout="topleft" + top_delta="0" + left="170" + height="20" + width="130" + text_color="White_25" + > + (requires restart) + </text> + <radio_group + height="30" + layout="topleft" + left="40" + control_name="ChatWindow" + name="chat_window" + top_pad="0" + tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)" + width="331"> + <radio_item + height="16" + label="Separate windows" + layout="topleft" + left="0" + name="radio" + value="0" + top="0" + width="150" /> + <radio_item + height="16" + label="Tabs" + layout="topleft" + left_delta="0" + name="radio2" + value="1" + top_pad="5" + width="150" /> + </radio_group> <check_box - control_name="UseChatBubbles" + control_name="TranslateChat" + enabled="true" height="16" - label="Show chat bubbles" + label="Use machine translation while chatting (powered by Google)" layout="topleft" - left_pad="8" - name="bubble_text_chat" - top_delta="1" - width="237" /> - <slider - control_name="ChatBubbleOpacity" + left="30" + name="translate_chat_checkbox" + bottom_delta="40" + width="400" /> + <text + bottom_delta="30" + name="translate_language_text" follows="left|top" - height="12" - increment="0.05" - initial_value="1" - label="Opacity" layout="topleft" - left_delta="0" - name="bubble_chat_opacity" - top_pad="4" - width="200" /> + left_delta="20" + height="20" + width="110"> + Translate chat into: + </text> + <combo_box + allow_text_entry="true" + bottom_delta="3" + control_name="TranslateLanguage" + enabled="true" + follows="left|top" + height="23" + left_delta="110" + max_chars="135" + mouse_opaque="true" + name="translate_language_combobox" + width="146"> + <combo_box.item + label="System Default" + name="System Default Language" + value="default" /> + <combo_box.item + label="English" + name="English" + value="en" /> + <!-- After "System Default" and "English", please keep the rest of these combo_box.items in alphabetical order by the first character in the string. --> + <combo_box.item + label="Dansk (Danish)" + name="Danish" + value="da" /> + <combo_box.item + label="Deutsch (German)" + name="German" + value="de" /> + <combo_box.item + label="Español (Spanish)" + name="Spanish" + value="es" /> + <combo_box.item + label="Français (French)" + name="French" + value="fr" /> + <combo_box.item + label="Italiano (Italian)" + name="Italian" + value="it" /> + <combo_box.item + label="Magyar (Hungarian)" + name="Hungarian" + value="hu" /> + <combo_box.item + label="Nederlands (Dutch)" + name="Dutch" + value="nl" /> + <combo_box.item + label="Polski (Polish)" + name="Polish" + value="pl" /> + <combo_box.item + label="Português (Portuguese)" + name="Portugese" + value="pt" /> + <combo_box.item + label="Русский (Russian)" + name="Russian" + value="ru" /> + <combo_box.item + label="Türkçe (Turkish)" + name="Turkish" + value="tr" /> + <combo_box.item + label="Українська (Ukrainian)" + name="Ukrainian" + value="uk" /> + <combo_box.item + label="中文 (简体) (Chinese)" + name="Chinese" + value="zh" /> + <combo_box.item + label="日本語 (Japanese)" + name="Japanese" + value="ja" /> + <combo_box.item + label="한국어 (Korean)" + name="Korean" + value="ko" /> + </combo_box> </panel> 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 b30bda3e59..17eebffa02 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -9,419 +9,358 @@ name="general_panel" top="1" width="517"> + <text + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left="30" + name="language_textbox" + top="10" + width="400"> + Language: + </text> <combo_box - control_name="LoginLocation" - follows="left|bottom" - height="18" + control_name="Language" + follows="left|top" + height="23" layout="topleft" - left_delta="151" - name="start_location_combo" - top="7" - width="155"> + left="50" + max_chars="135" + name="language_combobox" + width="200"> <combo_box.item - label="My Last Location" - value="last" /> + enabled="true" + label="System default" + name="System Default Language" + value="default" /> <combo_box.item - label="My Home" - value="home" /> - </combo_box> - <check_box - control_name="ShowStartLocation" - height="16" - initial_value="true" - label="Show Start Location on Login Screen" - layout="topleft" - left_delta="0" - name="show_location_checkbox" - top_pad="3" - width="256" /> - <combo_box - control_name="RenderName" - height="18" - layout="topleft" - left_delta="4" - name="fade_out_combobox" - top_pad="7" - width="146"> + enabled="true" + label="English" + name="English" + value="en" /> <combo_box.item - label="Never" - value="0" /> + enabled="true" + label="Dansk (Danish) - Beta" + name="Danish" + value="da" /> <combo_box.item - label="Show Temporarily" - value="1" /> + enabled="true" + label="Deutsch (German) - Beta" + name="Deutsch(German)" + value="de" /> <combo_box.item - label="Always" - value="2" /> + enabled="true" + label="Español (Spanish) - Beta" + name="Spanish" + value="es" /> + <combo_box.item + enabled="true" + label="Français (French) - Beta" + name="French" + value="fr" /> + <combo_box.item + enabled="true" + label="Italiano (Italian) - Beta" + name="Italian" + value="it" /> + <combo_box.item + enabled="true" + label="Nederlands (Dutch) - Beta" + name="Dutch" + value="nl" /> + <combo_box.item + enabled="true" + label="Polski (Polish) - Beta" + name="Polish" + value="pl" /> + <combo_box.item + enabled="true" + label="Português (Portuguese) - Beta" + name="Portugese" + value="pt" /> + <combo_box.item + enabled="true" + label="日本語 (Japanese) - Beta" + name="(Japanese)" + value="ja" /> </combo_box> - <check_box - control_name="SmallAvatarNames" - height="16" - initial_value="true" - label="Small Avatar Names" - layout="topleft" - left_delta="-4" - name="small_avatar_names_checkbox" - top_pad="9" - width="200" /> - <check_box - control_name="RenderNameHideSelf" - height="16" - label="Hide My Name On My Screen" - layout="topleft" - left_delta="0" - name="show_my_name_checkbox" - top_pad="2" - width="200" /> <text + font="SansSerifSmall" type="string" + text_color="White_50" length="1" follows="left|top" - height="16" - layout="topleft" - left="10" - name="group_titles_textbox" - top="120" - width="394"> - Group Titles: - </text> - <check_box - control_name="RenderHideGroupTitleAll" - height="16" - label="Hide All Group Titles" - layout="topleft" - left_delta="141" - name="show_all_title_checkbox" - top_delta="0" - width="256" /> - <check_box - control_name="RenderHideGroupTitle" - height="16" - label="Hide My Group Title" - layout="topleft" - left_delta="0" - name="show_my_title_checkbox" - top_pad="2" - width="256" /> - <color_swatch - border_color="0.45098 0.517647 0.607843 1" - control_name="EffectColor" - follows="left|top" - height="48" - layout="topleft" - left_delta="2" - name="effect_color_swatch" - tool_tip="Click to open Color Picker" - top_pad="8" - width="32" /> - <text - type="string" - length="1" - follows="left|top" - height="12" + height="18" layout="topleft" - left="10" - name="UI Size:" - top="203" - width="128"> - UI Size: + left_pad="10" + name="language_textbox2" + width="200"> + (Requires restart) </text> - <spinner - control_name="UIScaleFactor" - height="16" - increment="0.025" - initial_value="1" - layout="topleft" - left_pad="16" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_delta="-2" - width="58" /> - <check_box - control_name="UIAutoScale" - height="16" - label="Use resolution independent scale" - layout="topleft" - left_delta="-3" - name="ui_auto_scale" - top_pad="3" - width="256" /> - <spinner - control_name="AFKTimeout" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="300" - label="Away Timeout:" - label_width="141" - layout="topleft" - left="10" - max_val="600" - min_val="30" - name="afk_timeout_spinner" - top="244" - width="202" /> - <check_box - control_name="NotifyMoneyChange" - height="16" - label="Notify when Linden dollars (L$) spent or received" - layout="topleft" - left="151" - name="notify_money_change_checkbox" - top="270" - width="256" /> <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" - left="10" - name="maturity_desired_label" - top="312" - width="394"> - Rating: + left="30" + top_pad="15" + name="maturity_desired_prompt" + width="200"> + I want to access content rated: </text> - <text + <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" - left_delta="141" - name="maturity_desired_prompt" - top_delta="0" - width="394"> - I want to access content rated: + left_pad="5" + name="maturity_desired_textbox" + width="200"> </text> <combo_box control_name="PreferredMaturity" - height="18" + follows="left|top" + height="23" layout="topleft" - left_delta="164" + left="50" name="maturity_desired_combobox" - top_delta="-2" - width="150"> + width="200"> <combo_box.item - label="PG, Mature and Adult" + label="General, Moderate, Adult" + name="Desired_Adult" value="42" /> <combo_box.item - label="PG and Mature" + label="General and Moderate" + name="Desired_Mature" value="21" /> <combo_box.item - label="PG only" + label="General" + name="Desired_PG" value="13" /> + <combo_box.commit_callback + function="Pref.MaturitySettings"/> </combo_box> - <text - type="string" - length="1" + <icon follows="left|top" - height="10" + height="16" + image_name="Parcel_PG_Dark" layout="topleft" - left_delta="0" - name="maturity_desired_textbox" - top_delta="2" - width="150"> - PG only - </text> - <text - type="string" - length="1" + left_pad="5" + name="rating_icon_general" + top_delta="3" + width="18"/> + <icon follows="left|top" - height="10" + height="16" + image_name="Parcel_M_Dark" layout="topleft" - left="10" - name="start_location_textbox" - top="10" - width="394"> - Start Location: - </text> - <text - type="string" - length="1" + left_pad="2" + name="rating_icon_moderate" + width="18"/> + <icon follows="left|top" - height="10" + height="16" + image_name="Parcel_R_Dark" layout="topleft" - left_delta="0" - name="show_names_textbox" - top_pad="34" - width="394"> - Show Names: - </text> + left_pad="2" + name="rating_icon_adult" + width="18"/> <text type="string" length="1" follows="left|top" - height="10" + height="15" layout="topleft" - left_delta="0" - name="effects_color_textbox" - top_pad="110" + left="30" + name="start_location_textbox" + top_pad="15" width="394"> - Color For My Effects: + Start location: </text> - <text - type="string" - length="1" + <combo_box + control_name="LoginLocation" follows="left|top" - height="10" + height="23" layout="topleft" - left="220" - name="seconds_textbox" - top="244" - width="128"> - seconds - </text> + name="start_location_combo" + left="50" + width="200"> + <combo_box.item + label="My Last Location" + name="MyLastLocation" + value="last" /> + <combo_box.item + label="My Home" + name="MyHome" + value="home" /> + </combo_box> + <check_box + control_name="ShowStartLocation" + height="16" + initial_value="true" + label="Show on login" + layout="topleft" + left_pad="5" + name="show_location_checkbox" + top_delta="5" + width="256" /> + <text + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left="30" + name="name_tags_textbox" + top_pad="15" + width="400"> + Name tags: + </text> + <radio_group + control_name="AvatarNameTagMode" + height="20" + layout="topleft" + left="50" + name="Name_Tag_Preference"> + <radio_item + label="Off" + layout="topleft" + name="radio" + value="0" + width="75" /> + <radio_item + label="On" + layout="topleft" + left_pad="12" + name="radio2" + value="1" + width="75" /> + <radio_item + label="Show briefly" + layout="topleft" + left_pad="12" + name="radio3" + value="2" + width="160" /> + </radio_group> + <check_box + enabled_control="AvatarNameTagMode" + control_name="RenderNameShowSelf" + height="16" + label="Show my name" + layout="topleft" + left="50" + name="show_my_name_checkbox1" + width="300" /> + <check_box + enabled_control="AvatarNameTagMode" + control_name="RenderShowGroupTitleAll" + height="16" + label="Show group titles" + layout="topleft" + left_delta="175" + name="show_all_title_checkbox1" + width="200" /> <text type="string" length="1" follows="left|top" - height="18" + height="15" layout="topleft" - left="10" - name="crash_report_textbox" - top="344" - width="394"> - Crash reports: + left="30" + name="effects_color_textbox" + top_pad="15" + width="200"> + My effects: </text> <text - type="string" - length="1" + type="string" + length="1" + follows="left|top" + height="13" + layout="topleft" + left_pad="5" + name="title_afk_text" + width="190"> + Away timeout: + </text> + <color_swatch + can_apply_immediately="true" follows="left|top" - height="18" + height="50" layout="topleft" - left_delta="0" - name="language_textbox" - top_pad="4" - width="394"> - Language: - </text> + left="50" + name="effect_color_swatch" + tool_tip="Click to open Color Picker" + width="38"> + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="EffectColor" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="EffectColor" /> + </color_swatch> + <combo_box + height="23" + layout="topleft" + control_name="AFKTimeout" + left_pad="160" + label="Away timeout:" + top_delta="0" + name="afk" + width="130"> + <combo_box.item + label="2 minutes" + name="item0" + value="120" /> + <combo_box.item + label="5 minutes" + name="item1" + value="300" /> + <combo_box.item + label="10 minutes" + name="item2" + value="600" /> + <combo_box.item + label="30 minutes" + name="item3" + value="1800" /> + <combo_box.item + label="never" + name="item4" + value="0" /> + </combo_box> <text type="string" length="1" follows="left|top" - height="18" + height="13" layout="topleft" - left_delta="293" - name="language_textbox2" - top_delta="1" - width="400"> - (Requires restart for full effect) + left="30" + mouse_opaque="false" + name="text_box3" + top_pad="15" + width="240"> + Busy mode response: </text> - <combo_box - control_name="CrashSubmitBehavior" - height="18" + <text_editor + control_name="BusyModeResponse" + text_readonly_color="LabelDisabledColor" + bg_writeable_color="LtGray" + use_ellipses="false" + commit_on_focus_lost = "true" + follows="left|top|right" + height="60" layout="topleft" - left="153" - name="crash_behavior_combobox" - top="344" - width="146"> - <combo_box.item - enabled="true" - label="Ask before sending" - value="Ask before sending" /> - <combo_box.item - enabled="true" - label="Always send" - value="Always send" /> - <combo_box.item - enabled="true" - label="Never send" - value="Never send" /> - </combo_box> - <combo_box - allow_text_entry="true" - control_name="Language" - follows="left|bottom" - height="16" - layout="topleft" - left_delta="0" - max_chars="135" - name="language_combobox" - top_pad="4" - width="146"> - <combo_box.item - enabled="true" - label="System Default" - value="default" /> - <combo_box.item - enabled="true" - label="English" - value="en" /> - <combo_box.item - enabled="true" - label="Dansk (Danish) - Beta" - value="da" /> - <combo_box.item - enabled="true" - label="Deutsch (German) - Beta" - value="de" /> - <combo_box.item - enabled="true" - label="Español (Spanish) - Beta" - value="es" /> - <combo_box.item - enabled="true" - label="Français (French) - Beta" - value="fr" /> - <combo_box.item - enabled="true" - label="Italiano (Italian) - Beta" - value="it" /> - <combo_box.item - enabled="true" - label="Magyar (Hungarian) - Beta" - value="hu" /> - <combo_box.item - enabled="true" - label="Nederlands (Dutch) - Beta" - value="nl" /> - <combo_box.item - enabled="true" - label="Polski (Polish) - Beta" - value="pl" /> - <combo_box.item - enabled="true" - label="Portugués (Portuguese) - Beta" - value="pt" /> - <combo_box.item - enabled="true" - label="Русский (Russian) - Beta" - value="ru" /> - <combo_box.item - enabled="true" - label="Türkçe (Turkish) - Beta" - value="tr" /> - <combo_box.item - enabled="true" - label="Українська (Ukrainian) - Beta" - value="uk" /> - <combo_box.item - enabled="true" - label="中文 (简体) (Chinese) - Beta" - value="zh" /> - <combo_box.item - enabled="true" - label="日本語 (Japanese) - Beta" - value="ja" /> - <combo_box.item - enabled="true" - label="한국어 (Korean) - Beta" - value="ko" /> - <combo_box.item - enabled="true" - label="Test Language" - value="test" /> - </combo_box> - <check_box - control_name="LanguageIsPublic" - height="16" - label="Share language with objects" - layout="topleft" - left_delta="-2" - name="language_is_public" - tool_tip="This lets in-world objects know your preferred language." - top_pad="2" - width="256" /> + left="50" + name="busy_response" + width="450" + word_wrap="true"> + log_in_to_change + </text_editor> + </panel> 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 929f857e90..7ae717d0e3 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -9,357 +9,158 @@ name="Display panel" top="1" width="517"> - <panel.string - name="resolution_format"> - [RES_X] x [RES_Y] - </panel.string> - <panel.string - name="aspect_ratio_text"> - [NUM]:[DEN] - </panel.string> - <button - follows="left|top" - height="18" - label="?" - layout="topleft" - left="470" - name="GraphicsPreferencesHelpButton" - top="4" - width="22"> - <button.commit_callback - function="Pref.OpenHelp" /> - </button> - <check_box - control_name="NotFullScreen" - height="16" - label="Run Second Life in a window" - layout="topleft" - left_delta="-460" - name="windowed mode" - top_delta="3" - width="100"> - <check_box.commit_callback - function="Pref.OpenHelp" /> - </check_box> - <text_editor - make_visible_control="NotFullScreen" - type="string" - length="1" - bg_readonly_color="0 0 0 0" - enabled="false" - follows="left|top" - height="20" - hide_border="true" - hide_scrollbar="true" - layout="topleft" - left_delta="0" - max_length="65535" - name="FullScreenInfo" - tab_stop="false" - top_delta="16" - width="350" - word_wrap="true"> - If unchecked, viewer will display full-screen when logged in. - </text_editor> <text - make_visible_control="NotFullScreen" type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="0" - name="WindowSizeLabel" - top_pad="7" - width="128"> - Window Size: + left="30" + name="QualitySpeed" + top="10" + width="400"> + Quality and speed: </text> - <combo_box - make_visible_control="NotFullScreen" - height="18" - layout="topleft" - left_pad="47" - name="windowsize combo" - top_delta="-1" - width="150"> - <combo_box.item - enabled="true" - label="640x480" - value="640 x 480" /> - <combo_box.item - enabled="true" - label="800x600 " - value="800 x 600" /> - <combo_box.item - enabled="true" - label="720x480 (NTSC)" - value="720 x 480" /> - <combo_box.item - enabled="true" - label="768x576 (PAL)" - value="768 x 576" /> - <combo_box.item - enabled="true" - label="1024x768" - value="1024 x 768" /> - </combo_box> <text - make_invisible_control="NotFullScreen" type="string" length="1" follows="left|top" + halign="right" height="12" layout="topleft" - left_delta="-175" - name="DisplayResLabel" - top_delta="1" - width="128"> - Display Resolution: + left="35" + name="FasterText" + top_pad="4" + width="80"> + Faster </text> - <combo_box - make_invisible_control="NotFullScreen" - height="18" - layout="topleft" - left_pad="47" - name="fullscreen combo" - top_delta="-1" - width="150" /> <text - make_invisible_control="NotFullScreen" type="string" length="1" follows="left|top" height="12" layout="topleft" - left="10" - name="AspectRatioLabel1" - tool_tip="width / height" - top="27" - width="160"> - Aspect Ratio: + left_delta="360" + name="BetterText" + top_delta="0" + width="100"> + Better </text> - <combo_box - make_invisible_control="NotFullScreen" - allow_text_entry="true" - height="16" + <icon + color="0.12 0.12 0.12 1" + height="14" + image_name="Rounded_Square" layout="topleft" - left_pad="15" - max_chars="100" - name="aspect_ratio" - tool_tip="width / height" - top_delta="0" - width="150"> - <combo_box.item - enabled="true" - label="4:3 (Standard CRT)" - value="1.333333" /> - <combo_box.item - enabled="true" - label="5:4 (1280x1024 LCD)" - value="1.25" /> - <combo_box.item - enabled="true" - label="8:5 (Widescreen)" - value="1.6" /> - <combo_box.item - enabled="true" - label="16:9 (Widescreen)" - value="1.7777777" /> - </combo_box> - <check_box - make_invisible_control="NotFullScreen" - control_name="FullScreenAutoDetectAspectRatio" - height="16" - label="Auto-detect ratio" + left="128" + name="LowGraphicsDivet" + top_delta="-2" + width="2" /> + <icon + color="0.12 0.12 0.12 1" + height="14" + image_name="Rounded_Square" layout="topleft" - left_pad="23" - name="aspect_auto_detect" - top_delta="1" - width="256"> - <check_box.commit_callback - function="Pref.AutoDetectAspect" /> - </check_box> - <text - type="string" - length="1" - follows="left|top" - height="12" + left_pad="83" + name="MidGraphicsDivet" + top_delta="0" + width="2" /> + <icon + color="0.12 0.12 0.12 1" + height="14" + image_name="Rounded_Square" layout="topleft" - left="10" - name="HigherText" - top="73" - width="80"> - Quality and - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" + left_pad="85" + name="HighGraphicsDivet" + top_delta="0" + width="2" /> + <icon + color="0.12 0.12 0.12 1" + height="14" + image_name="Rounded_Square" layout="topleft" - left_delta="0" - name="QualityText" - top_pad="2" - width="95"> - Performance: - </text> - <text - type="string" - length="1" + left_pad="83" + name="UltraGraphicsDivet" + top_delta="0" + width="2" /> + <slider + control_name="RenderQualityPerformance" + decimal_digits="0" follows="left|top" - height="12" + height="16" + increment="1" + initial_value="0" layout="topleft" - left="115" - name="FasterText" - top="74" - width="80"> - Faster - </text> + left="120" + max_val="3" + name="QualityPerformanceSelection" + show_text="false" + top_delta="-2" + width="275"> + <slider.commit_callback + function="Pref.QualityPerformance"/> + </slider> <text type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left="158" + left="88" name="ShadersPrefText" - top="93" - width="40"> + top_delta="20" + width="80"> Low </text> <text type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_pad="7" + left_delta="87" name="ShadersPrefText2" top_delta="0" - width="40"> + width="80"> Mid </text> <text type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_pad="7" + left_delta="87" name="ShadersPrefText3" top_delta="0" - width="40"> + width="80"> High </text> <text type="string" length="1" follows="left|top" + halign="center" height="12" layout="topleft" - left_pad="7" + left_delta="85" name="ShadersPrefText4" top_delta="0" - width="40"> - Ultra - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="334" - name="HigherText2" - top="68" width="80"> - Higher - </text> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="0" - name="QualityText2" - top_pad="2" - width="95"> - Quality + Ultra </text> - <icon - color="0.12 0.12 0.12 1" - height="14" - image_name="rounded_square.tga" - layout="topleft" - left="173" - name="LowGraphicsDivet" - top="75" - width="2" /> - <icon - color="0.12 0.12 0.12 1" - height="14" - image_name="rounded_square.tga" - layout="topleft" - left_pad="42" - name="MidGraphicsDivet" - top_delta="0" - width="2" /> - <icon - color="0.12 0.12 0.12 1" - height="14" - image_name="rounded_square.tga" - layout="topleft" - left_pad="42" - name="HighGraphicsDivet" - top_delta="0" - width="2" /> - <icon - color="0.12 0.12 0.12 1" - height="14" - image_name="rounded_square.tga" - layout="topleft" - left_pad="42" - name="UltraGraphicsDivet" - top_delta="0" - width="2" /> - <slider - control_name="RenderQualityPerformance" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - layout="topleft" - left_delta="-140" - max_val="3" - name="QualityPerformanceSelection" - show_text="false" - top_delta="-1" - width="150" /> - <check_box - control_name="RenderCustomSettings" - height="16" - initial_value="true" - label="Custom" - layout="topleft" - left_pad="70" - name="CustomSettings" - top_delta="1" - width="256"> - <check_box.commit_callback - function="Pref.ChangeCustom" /> - </check_box> - <panel - make_visible_control="RenderCustomSettings" - border="true" + <panel + visiblity_control="ShowAdvancedGraphicsSettings" + border="false" follows="top|left" - height="260" + height="283" label="CustomGraphics" layout="topleft" left="5" name="CustomGraphics Panel" - top="115" + top="76" width="485"> <text type="string" @@ -377,7 +178,7 @@ control_name="RenderObjectBump" height="16" initial_value="true" - label="Bump Mapping and Shiny" + label="Bump mapping and shiny" layout="topleft" left_delta="0" name="BumpShiny" @@ -387,11 +188,11 @@ control_name="VertexShaderEnable" height="16" initial_value="true" - label="Basic Shaders" + label="Basic shaders" layout="topleft" left_delta="0" name="BasicShaders" - tool_tip="Disabling this option may prevent some graphics card drivers from crashing." + tool_tip="Disabling this option may prevent some graphics card drivers from crashing" top_pad="1" width="315"> <check_box.commit_callback @@ -401,7 +202,7 @@ control_name="WindLightUseAtmosShaders" height="16" initial_value="true" - label="Atmospheric Shaders" + label="Atmospheric shaders" layout="topleft" left_delta="0" name="WindLightUseAtmosShaders" @@ -410,161 +211,140 @@ <check_box.commit_callback function="Pref.VertexShaderEnable" /> </check_box> - <check_box - control_name="RenderWaterReflections" +<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS + <check_box + control_name="RenderDeferred" height="16" initial_value="true" - label="Water Reflections" + label="Lighting and Shadows" layout="topleft" left_delta="0" - name="Reflections" + name="UseLightShaders" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="0" - name="ReflectionDetailText" - top_pad="7" - width="128"> - Reflection Detail: - </text> - <radio_group - control_name="RenderReflectionDetail" - draw_border="false" - height="70" - layout="topleft" - left_delta="-2" - name="ReflectionDetailRadio" - top_pad="3" - width="321"> - <radio_item - height="16" - label="Terrain and Trees" - layout="topleft" - left="3" - name="0" - top="3" - width="315" /> - <radio_item - height="16" - label="All Static Objects" - layout="topleft" - left_delta="0" - name="1" - top_delta="16" - width="315" /> - <radio_item - height="16" - label="All Avatars and Objects" - layout="topleft" - left_delta="0" - name="2" - top_delta="16" - width="315" /> - <radio_item - height="16" - label="Everything" - layout="topleft" - left_delta="0" - name="3" - top_delta="16" - width="315" /> - </radio_group> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left_delta="2" - name="AvatarRenderingText" - top_pad="5" - width="128"> - Avatar Rendering: - </text> - <check_box - control_name="RenderUseImpostors" - height="16" - initial_value="true" - label="Avatar Impostors" - layout="topleft" - left_delta="0" - name="AvatarImpostors" - top_pad="7" - width="256" /> - <check_box - control_name="RenderAvatarVP" + </check_box> + <check_box + control_name="RenderDeferredSSAO" height="16" initial_value="true" - label="Hardware Skinning" + label="Ambient Occlusion" layout="topleft" left_delta="0" - name="AvatarVertexProgram" + name="UseSSAO" top_pad="1" width="256"> - <check_box.commit_callback + <check_box.commit_callback function="Pref.VertexShaderEnable" /> - </check_box> - <check_box - control_name="RenderAvatarCloth" - height="16" - initial_value="true" - label="Avatar Cloth" - layout="topleft" - left_delta="0" - name="AvatarCloth" - top_pad="1" - width="256" /> - <text - type="string" - length="1" + </check_box> + + <text + type="string" + length="1" + top_pad="8" + follows="top|left" + height="23" + width="110" + word_wrap="true" + layout="topleft" + left="10" + name="shadows_label"> + Shadows: + </text> + <combo_box + control_name="RenderShadowDetail" + height="23" + layout="topleft" + left="10" + top_pad="0" + name="ShadowDetail" + width="150"> + <combo_box.item + label="None" + name="0" + value="0"/> + <combo_box.item + label="Sun/Moon" + name="1" + value="1"/> + <combo_box.item + label="Sun/Moon + Projectors" + name="2" + value="2"/> + </combo_box> +--> + <text + type="string" + length="1" + top_pad="8" + follows="top|left" + height="23" + width="110" + word_wrap="true" + layout="topleft" + left="10" + name="reflection_label"> + Water Reflections: + </text> + <combo_box + control_name="RenderReflectionDetail" + height="23" + layout="topleft" + left_delta="10" + top_pad ="0" + name="Reflections" + width="150"> + <combo_box.item + label="Minimal" + name="0" + value="0"/> + <combo_box.item + label="Terrain and trees" + name="1" + value="1"/> + <combo_box.item + label="All static objects" + name="2" + value="2"/> + <combo_box.item + label="All avatars and objects" + name="3" + value="3"/> + <combo_box.item + label="Everything" + name="4" + value="4"/> + </combo_box> + + <slider + control_name="RenderFarClip" + decimal_digits="0" follows="left|top" - height="12" + height="16" + increment="8" + initial_value="160" + label="Draw distance:" + label_width="185" layout="topleft" - left="457" - name="DrawDistanceMeterText1" + left="200" + max_val="512" + min_val="64" + name="DrawDistance" top="3" - width="128"> - m - </text> + width="296" /> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="6" + left_delta="291" name="DrawDistanceMeterText2" top_delta="0" width="128"> m - </text> - <slider - control_name="RenderFarClip" - decimal_digits="0" - follows="left|top" - height="16" - increment="8" - initial_value="160" - label="Draw Distance:" - label_width="140" - layout="topleft" - left_delta="-248" - max_val="512" - min_val="64" - name="DrawDistance" - top_delta="0" - width="255"> - <slider.commit_callback - function="Pref.UpdateMeterText" /> - </slider> + </text> <slider control_name="RenderMaxPartCount" decimal_digits="0" @@ -572,14 +352,30 @@ height="16" increment="256" initial_value="4096" - label="Max. Particle Count:" - label_width="140" + label="Max. particle count:" + label_width="185" layout="topleft" - left_delta="0" + left="200" max_val="8192" name="MaxParticleCount" - top_pad="4" - width="262" /> + top_pad="7" + width="303" /> + <slider + control_name="RenderAvatarMaxVisible" + decimal_digits="0" + follows="left|top" + height="16" + increment="1" + initial_value="12" + label="Max. # of non-impostor avatars:" + label_width="185" + layout="topleft" + left_delta="0" + max_val="65" + min_val="1" + name="MaxNumberAvatarDrawn" + top_pad="4" + width="290" /> <slider control_name="RenderGlowResolutionPow" decimal_digits="0" @@ -587,16 +383,16 @@ height="16" increment="1" initial_value="8" - label="Post Process Quality:" - label_width="140" + label="Post process quality:" + label_width="185" layout="topleft" - left_delta="0" + left="200" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="PostProcessText" /> @@ -611,7 +407,7 @@ name="MeshDetailText" top_pad="5" width="128"> - Mesh Detail: + Mesh detail: </text> <slider control_name="RenderVolumeLODFactor" @@ -620,14 +416,14 @@ increment="0.125" initial_value="160" label=" Objects:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="2" name="ObjectMeshDetail" show_text="false" top_pad="6" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="ObjectMeshDetailText" /> @@ -638,13 +434,13 @@ height="16" initial_value="160" label=" Flexiprims:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="FlexibleMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="FlexibleMeshDetailText" /> @@ -656,13 +452,13 @@ increment="0.125" initial_value="160" label=" Trees:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="TreeMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TreeMeshDetailText" /> @@ -674,13 +470,13 @@ increment="0.125" initial_value="160" label=" Avatars:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="AvatarMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="AvatarMeshDetailText" /> @@ -692,7 +488,7 @@ increment="0.125" initial_value="160" label=" Terrain:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="2" @@ -700,7 +496,7 @@ name="TerrainMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TerrainMeshDetailText" /> @@ -714,7 +510,7 @@ increment="8" initial_value="160" label=" Sky:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="128" @@ -722,7 +518,7 @@ name="SkyMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="SkyMeshDetailText" /> @@ -733,9 +529,9 @@ follows="left|top" height="12" layout="topleft" - left="444" + left="469" name="PostProcessText" - top="305" + top="60" width="128"> Low </text> @@ -812,55 +608,63 @@ width="128"> Low </text> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left_delta="-260" + name="AvatarRenderingText" + top_pad="18" + width="128"> + Avatar rendering: + </text> + <check_box + control_name="RenderUseImpostors" + height="16" + initial_value="true" + label="Avatar impostors" + layout="topleft" + left_delta="0" + name="AvatarImpostors" + top_pad="7" + width="256" /> + <check_box + control_name="RenderAvatarVP" + height="16" + initial_value="true" + label="Hardware skinning" + layout="topleft" + left_delta="0" + name="AvatarVertexProgram" + top_pad="1" + width="256"> + <check_box.commit_callback + function="Pref.VertexShaderEnable" /> + </check_box> + <check_box + control_name="RenderAvatarCloth" + height="16" + initial_value="true" + label="Avatar cloth" + layout="topleft" + left_delta="0" + name="AvatarCloth" + top_pad="1" + width="256" /> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="-230" - name="LightingDetailText" - top_pad="8" - width="128"> - Lighting Detail: - </text> - <radio_group - control_name="RenderLightingDetail" - draw_border="false" - height="38" - layout="topleft" - left_delta="0" - name="LightingDetailRadio" - top_pad="5" - width="321"> - <radio_item - height="16" - label="Sun and moon only" - layout="topleft" - left="3" - name="SunMoon" - top="3" - width="156" /> - <radio_item - height="16" - label="Nearby local lights" - layout="topleft" - left_delta="0" - name="LocalLights" - top_delta="16" - width="156" /> - </radio_group> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="360" + left="358" + left_pad="-30" name="TerrainDetailText" - top="465" - width="128"> - Terrain Detail: + top="226" + width="155"> + Terrain detail: </text> <radio_group control_name="RenderTerrainDetail" @@ -870,45 +674,71 @@ left_delta="0" name="TerrainDetailRadio" top_pad="5" - width="321"> + width="70"> <radio_item height="16" label="Low" layout="topleft" - left="3" name="0" top="3" - width="315" /> + width="50" /> <radio_item height="16" label="High" layout="topleft" - left_delta="0" name="2" top_delta="16" - width="315" /> - </radio_group> - </panel> + width="50" /> + </radio_group> --> + </panel> + + <button + follows="left|bottom" + height="23" + label="Apply" + label_selected="Apply" + layout="topleft" + left="10" + name="Apply" + top="383" + width="115" + > + <button.commit_callback + function="Pref.Apply" /> + </button> <button - height="20" - label="Recommended Settings" + follows="left|bottom" + height="23" + label="Reset" layout="topleft" - left="130" + left_pad="3" name="Defaults" - top="380" - width="170"> + top="383" + width="115"> <button.commit_callback function="Pref.HardwareDefaults" /> </button> <button - height="20" - label="Hardware Options" - label_selected="Hardware Options" + control_name="ShowAdvancedGraphicsSettings" + follows="right|bottom" + height="23" + is_toggle="true" + label="Advanced" + layout="topleft" + left_pad="35" + name="Advanced" + top_delta="0" + width="115" /> + <button + follows="right|bottom" + height="23" + label="Hardware" + label_selected="Hardware" layout="topleft" - left_pad="10" + left_pad="3" name="GraphicsHardwareButton" top_delta="0" - width="170"> + width="115"> <button.commit_callback function="Pref.HardwareSettings" /> </button> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml new file mode 100644 index 0000000000..4ebd4c76f8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="left|top|right|bottom" + height="408" + label="Communication" + layout="topleft" + left="102" + name="im" + top="1" + width="517"> + <panel.string + name="log_in_to_change"> + log in to change + </panel.string> + <button + follows="left|bottom" + height="23" + label="Clear History" + tool_tip="Clear login image, last location, teleport history, web, and texture cache" + layout="topleft" + left="30" + name="clear_cache" + top="10" + width="145"> + <button.commit_callback + function="Pref.WebClearCache" /> + </button> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="10" + mouse_opaque="false" + name="cache_size_label_l" + top_delta="3" + text_color="LtGray_50" + width="300"> + (Locations, images, web, search history) + </text> + <check_box + height="16" + enabled="false" + label="Only friends and groups know I'm online" + layout="topleft" + left="30" + name="online_visibility" + top_pad="20" + width="350" /> + <check_box + enabled_control="EnableVoiceChat" + control_name="VoiceCallsFriendsOnly" + height="16" + label="Only friends and groups can call or IM me" + layout="topleft" + left="30" + name="voice_call_friends_only_check" + top_pad="10" + width="350" /> + <check_box + enabled_control="EnableVoiceChat" + control_name="AutoDisengageMic" + height="16" + label="Switch off microphone when ending calls" + layout="topleft" + left="30" + name="auto_disengage_mic_check" + top_pad="10" + width="350" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + mouse_opaque="false" + name="Logs:" + top_pad="10" + width="350"> + Logs: + </text> + <check_box + enabled="false" + control_name="LogNearbyChat" + height="16" + label="Save nearby chat logs on my computer" + layout="topleft" + left="30" + name="log_nearby_chat" + top_pad="10" + width="350"> + </check_box> + <check_box + enabled="false" + control_name="LogInstantMessages" + height="16" + label="Save IM logs on my computer" + layout="topleft" + left="30" + name="log_instant_messages" + top_pad="10" + width="350"> + </check_box> + <check_box + control_name="LogTimestamp" + enabled="false" + height="16" + label="Add timestamp" + layout="topleft" + left_delta="0" + name="show_timestamps_check_im" + top_pad="10" + width="237" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="log_path_desc" + top_pad="5" + width="128"> + Location of logs: + </text> + <line_editor + bottom="366" + control_name="InstantMessageLogPath" + follows="top|left|right" + halign="right" + height="23" + layout="topleft" + left_delta="0" + mouse_opaque="false" + name="log_path_string" + top_pad="5" + width="250"/> + <button + enabled="false" + follows="right|bottom" + height="23" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="log_path_button" + top_delta="0" + width="145"> + <button.commit_callback + function="Pref.LogPath" /> + </button> + <button + follows="left|bottom" + height="23" + label="Block list" + layout="topleft" + left="30" + name="block_list" + top_pad="20" + width="145"> + <!--<button.commit_callback + function="SideTray.ShowPanel"--> + <button.commit_callback + function="Pref.BlockList"/> + </button> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml new file mode 100644 index 0000000000..140d16e37f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -0,0 +1,389 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="left|top|right|bottom" + height="408" + label="Setup" + layout="topleft" + left="102" + name="Input panel" + top="1" + width="517"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Mouselook:" + top="10" + width="300"> + Mouselook: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="50" + name=" Mouse Sensitivity" + top_pad="10" + width="150"> + Mouse sensitivity + </text> + <slider + control_name="MouseSensitivity" + follows="left|top" + height="15" + initial_value="2" + layout="topleft" + show_text="false" + left_delta="150" + max_val="15" + name="mouse_sensitivity" + top_delta="0" + width="145" /> + <check_box + control_name="InvertMouse" + height="16" + label="Invert" + layout="topleft" + left_pad="2" + name="invert_mouse" + top_delta="0" + width="128" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Network:" + mouse_opaque="false" + top_pad="4" + width="300"> + Network: + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="50" + name="Maximum bandwidth" + mouse_opaque="false" + top_pad="10" + width="200"> + Maximum bandwidth + </text> + <slider + can_edit_text="true" + control_name="ThrottleBandwidthKBPS" + decimal_digits="0" + follows="left|top" + height="15" + increment="100" + initial_value="500" + layout="topleft" + left_delta="150" + max_val="10000" + min_val="100" + name="max_bandwidth" + top_delta="0" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="6" + mouse_opaque="false" + name="text_box2" + top_delta="1" + width="200"> + kbps + </text> + <check_box + control_name="ConnectionPortEnabled" + height="16" + label="Custom port" + layout="topleft" + left="77" + name="connection_port_enabled" + top_pad="20" + width="256"> + <check_box.commit_callback + function="Notification.Show" + parameter="ChangeConnectionPort" /> + </check_box> + <spinner + control_name="ConnectionPort" + enabled_control="ConnectionPortEnabled" + decimal_digits="0" + follows="left|top" + height="23" + increment="1" + initial_value="13000" + label="Port number:" + label_width="105" + layout="topleft" + left_delta="160" + max_val="13050" + min_val="13000" + name="connection_port" + top_delta="3" + width="170" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + mouse_opaque="false" + name="cache_size_label_l" + top_pad="20" + width="200"> + Cache size + </text> + <slider + can_edit_text="true" + control_name="CacheSize" + decimal_digits="0" + follows="left|top" + height="15" + increment="16" + initial_value="512" + layout="topleft" + left_delta="150" + max_val="1024" + min_val="32" + name="cache_size" + top_delta="-2" + width="180" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="6" + mouse_opaque="false" + name="text_box5" + top_delta="1" + width="40"> + MB + </text> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="80" + name="Cache location" + top_delta="20" + width="300"> + Cache location: + </text> + <line_editor + control_name="CacheLocationTopFolder" + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="80" + max_length="4096" + name="cache_location" + top_pad="5" + width="205" /> + <button + follows="left|top" + height="23" + label="Browse" + label_selected="Browse" + layout="topleft" + left_pad="5" + name="set_cache" + top_delta="-1" + width="100"> + <button.commit_callback + function="Pref.SetCache" /> + </button> + <button + follows="left|top" + height="23" + label="Reset" + label_selected="Reset" + layout="topleft" + left_pad="3" + name="reset_cache" + top_delta="0" + width="100"> + <button.commit_callback + function="Pref.ResetCache" /> + </button> + + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="30" + name="Web:" + top_pad="5" + width="300"> + Web: + </text> + <radio_group + control_name="UseExternalBrowser" + draw_border="false" + follows="top|left" + height="40" + layout="topleft" + left_delta="50" + name="use_external_browser" + top_pad="-2" + width="480"> + <radio_item + height="20" + label="Use my browser (IE, Firefox, Safari)" + layout="topleft" + left_delta="0" + name="external" + value="1" + top="0" + tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." + width="480" /> + <radio_item + height="20" + label="Use built-in browser" + layout="topleft" + left="0" + name="internal" + value="" + tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." + top_delta="20" + width="480" /> + </radio_group> + + <check_box + top_delta="2" + enabled="true" + follows="left|top" + height="18" + initial_value="true" + control_name="BrowserPluginsEnabled" + label="Enable plugins" + left_delta="20" + mouse_opaque="true" + name="browser_plugins_enabled" + radio_style="false" + width="400" + top_pad="5"/> + + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + initial_value="true" + control_name="CookiesEnabled" + label="Accept cookies" + left_delta="0" + mouse_opaque="true" + name="cookies_enabled" + radio_style="false" + width="400" + top_pad="5"/> + + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + initial_value="true" + control_name="BrowserJavascriptEnabled" + label="Enable Javascript" + left_delta="0" + mouse_opaque="true" + name="browser_javascript_enabled" + radio_style="false" + width="400" + top_pad="5"/> + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + initial_value="false" + control_name="MediaEnablePopups" + label="Enable media browser pop-ups" + left_delta="0" + mouse_opaque="true" + name="media_popup_enabled" + width="400" + top_pad="5"/> + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + initial_value="false" + control_name="BrowserProxyEnabled" + label="Enable Web Proxy" + left_delta="0" + mouse_opaque="true" + name="web_proxy_enabled" + radio_style="false" + width="400" top_pad="5"/> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_delta="20" + name="Proxy location" + top_delta="16" + width="300"> + Proxy location: + </text> + <line_editor + control_name="BrowserProxyAddress" + enabled_control="BrowserProxyEnabled" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left_delta="0" + name="web_proxy_editor" + tool_tip="The name or IP address of the proxy you would like to use" + top_pad="4" + width="200" /> + <spinner + control_name="BrowserProxyPort" + enabled_control="BrowserProxyEnabled" + decimal_digits="0" + follows="left|top" + height="23" + increment="1" + initial_value="80" + label="Port number:" + label_width="95" + layout="topleft" + left_delta="210" + max_val="12000" + min_val="10" + name="web_proxy_port" + top_delta="0" + width="145" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml new file mode 100644 index 0000000000..aa760edad3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -0,0 +1,553 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="all" + height="408" + label="Sounds" + layout="topleft" + left="102" + name="Preference Media panel" + top="1" + width="517"> + <slider + control_name="AudioLevelMaster" + follows="left|top" + font.style="BOLD" + height="15" + increment="0.025" + initial_value="0.5" + label="Master volume" + label_width="120" + layout="topleft" + left="0" + name="System Volume" + show_text="false" + slider_label.halign="right" + top="10" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteAudio" /> + </slider> + <button + control_name="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + control_name="MuteWhenMinimized" + height="15" + initial_value="true" + label="Mute when minimized" + layout="topleft" + name="mute_when_minimized" + top_delta="3" + left_pad="5" + width="235" /> + <slider + control_name="AudioLevelUI" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.025" + initial_value="0.5" + label="Buttons" + label_width="120" + layout="topleft" + left="0" + name="UI Volume" + show_text="false" + slider_label.halign="right" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteUI" /> + </slider> + <button + control_name="MuteUI" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <slider + control_name="AudioLevelAmbient" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.025" + initial_value="0.5" + label="Ambient" + label_width="120" + layout="topleft" + left="0" + name="Wind Volume" + show_text="false" + slider_label.halign="right" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteAmbient" /> + </slider> + <button + control_name="MuteAmbient" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <slider + control_name="AudioLevelSFX" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.025" + initial_value="0.5" + label="Sound Effects" + label_width="120" + slider_label.halign="right" + layout="topleft" + left="0" + name="SFX Volume" + show_text="false" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteSounds" /> + </slider> + <button + control_name="MuteSounds" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <slider + control_name="AudioLevelMusic" + disabled_control="MuteAudio" + follows="left|top" + height="15" + increment="0.025" + initial_value="0.5" + label="Streaming music" + label_width="120" + layout="topleft" + left="0" + name="Music Volume" + slider_label.halign="right" + show_text="false" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteMusic" /> + </slider> + <button + control_name="MuteMusic" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + control_name="AudioStreamingMusic" + height="16" + label="Enabled" + layout="topleft" + left_pad="5" + name="music_enabled" + top_delta="2" + width="350"/> + <slider + control_name="AudioLevelMedia" + disabled_control="MuteAudio" + follows="left|top" + height="16" + increment="0.025" + initial_value="0.5" + label="Media" + label_width="120" + layout="topleft" + left="0" + name="Media Volume" + show_text="false" + slider_label.halign="right" + top_pad="7" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteMedia" /> + </slider> + <button + control_name="MuteMedia" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + label_text.halign="left" + follows="left|top" + height="16" + control_name ="AudioStreamingMedia" + label="Enabled" + layout="topleft" + top_delta="2" + left_pad="5" + name="enable_media" + width="110"/> + <slider + control_name="AudioLevelVoice" + disabled_control="MuteAudio" + follows="left|top" + height="16" + increment="0.025" + initial_value="0.5" + label="Voice Chat" + label_width="120" + layout="topleft" + left="0" + top_delta="20" + name="Voice Volume" + show_text="false" + slider_label.halign="right" + volume="true" + width="300"> + <slider.commit_callback + function="Pref.setControlFalse" + parameter="MuteVoice" /> + </slider> + <button + control_name="MuteVoice" + disabled_control="MuteAudio" + follows="top|left" + height="16" + image_selected="AudioMute_Off" + image_unselected="Audio_Off" + is_toggle="true" + layout="topleft" + left_pad="5" + name="mute_audio" + tab_stop="false" + width="16" /> + <check_box + label_text.halign="left" + follows="left|top" + height="16" + control_name ="EnableVoiceChat" + disabled_control="CmdLineDisableVoice" + label="Enabled" + layout="topleft" + top_delta="2" + left_pad="5" + name="enable_voice_check" + width="110"/> + <!-- --> + <check_box + name="media_auto_play_btn" + control_name="ParcelMediaAutoPlayEnable" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Check this to let media auto-play if it wants" + label="Allow Media to auto-play" + top_pad="5" + left="25"/> + <check_box + name="media_show_on_others_btn" + control_name="MediaShowOnOthers" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Uncheck this to hide media attached to other avatars nearby" + label="Play media attached to other avatars" + left="25"/> + + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="25" + name="voice_chat_settings" + width="200" + top="210"> + Voice Chat Settings + </text> + <text + type="string" + length="1" + follows="left|top" + layout="topleft" + left="80" + top_delta="16" + name="Listen from" + width="142"> + Listen from: + </text> + <icon + follows="left|top" + height="18" + image_name="Cam_FreeCam_Off" + layout="topleft" + name="camera_icon" + mouse_opaque="false" + visible="true" + width="18" + left_pad="0" + top_delta="-5"/> + <icon + follows="left|top" + height="18" + image_name="Move_Walk_Off" + layout="topleft" + name="avatar_icon" + mouse_opaque="false" + visible="true" + width="18" + top_delta="20" /> + <radio_group + enabled_control="EnableVoiceChat" + control_name="VoiceEarLocation" + draw_border="false" + follows="left|top" + layout="topleft" + left_pad="2" + width="221" + height="38" + name="ear_location"> + <radio_item + height="16" + label="Camera position" + follows="left|top" + layout="topleft" + name="0" + width="200"/> + <radio_item + height="16" + follows="left|top" + label="Avatar position" + layout="topleft" + name="1" + width="200" /> + </radio_group> + <button + control_name="ShowDeviceSettings" + follows="left|top" + height="23" + is_toggle="true" + label="Input/Output devices" + layout="topleft" + left="80" + top_pad="5" + name="device_settings_btn" + width="190"> + </button> + <panel + background_visible="false" + bg_alpha_color="DkGray" + visiblity_control="ShowDeviceSettings" + border="false" + follows="top|left" + height="120" + label="Device Settings" + layout="topleft" + left="0" + name="device_settings_panel" + class="panel_voice_device_settings" + width="501" + top="285"> + <panel.string + name="default_text"> + Default + </panel.string> + <panel.string + name="default system device"> + Default system device + </panel.string> + <panel.string + name="no device"> + No device + </panel.string> + <icon + height="18" + image_name="Microphone_On" + left="80" + name="microphone_icon" + mouse_opaque="false" + top="7" + visible="true" + width="18" /> + <text + type="string" + length="1" + font.style="BOLD" + follows="left|top" + height="16" + layout="topleft" + left_pad="3" + name="Input" + width="200"> + Input + </text> + <combo_box + height="23" + control_name="VoiceInputAudioDevice" + layout="topleft" + left="165" + max_chars="128" + name="voice_input_device" + top_pad="-2" + width="200" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="165" + name="My volume label" + top_pad="5" + width="200"> + My volume: + </text> + <slider_bar + control_name="AudioLevelMic" + follows="left|top" + height="17" + increment="0.025" + initial_value="1.0" + layout="topleft" + left="160" + max_val="2" + name="mic_volume_slider" + tool_tip="Change the volume using this slider" + top_pad="-2" + width="220" /> + <text + type="string" + text_color="EmphasisColor" + length="1" + follows="left|top" + height="18" + layout="topleft" + left_pad="5" + name="wait_text" + top_delta="0" + width="110"> + Please wait + </text> + <locate + height="20" + layout="topleft" + left_delta="0" + name="bar0" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="5" + name="bar1" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="5" + name="bar2" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="5" + name="bar3" + top_delta="0" + width="20" /> + <locate + height="20" + layout="topleft" + left_pad="5" + name="bar4" + top_delta="0" + width="20" /> + <icon + height="18" + image_name="Parcel_Voice_Light" + left="80" + name="speaker_icon" + mouse_opaque="false" + top_pad="-8" + visible="true" + width="22" /> + <text + font.style="BOLD" + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left_pad="0" + name="Output" + width="200"> + Output + </text> + <combo_box + control_name="VoiceOutputAudioDevice" + height="23" + layout="topleft" + left="165" + max_chars="128" + name="voice_output_device" + top_pad="-2" + width="200" /> + </panel> + </panel> 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 new file mode 100644 index 0000000000..b25fd695c9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -0,0 +1,609 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|right|top|bottom" + name="MediaControls" + background_visible="false" + height="200" + layout="topleft" + help_topic="prim_media_controls" + mouse_opaque="false" + min_width="300" + width="800"> + <string name="control_background_image_name">Inspector_Background</string> + <string name="skip_step">0.2</string> + <string name="min_width">300</string> + <string name="min_height">75</string> + <string name="zoom_near_padding">1.0</string> + <string name="zoom_medium_padding">1.1</string> + <string name="zoom_far_padding">1.5</string> + <string name="top_world_view_avoid_zone">50</string> + <layout_stack + name="progress_indicator_area" + follows="left|right|top" + height="8" + layout="topleft" + animate="false" + left="0" + orientation="horizontal" + top="22"> + <!-- outer layout_panels center the inner one --> + <layout_panel + width="0" + name="left_bookend_bottom" + mouse_opaque="false" + layout="topleft" + user_resize="false" /> + <layout_panel + name="media_progress_indicator" + mouse_opaque="false" + height="8" + layout="topleft" + left="0" + top="0" + auto_resize="false" + user_resize="false" + min_width="100" + width="200"> + <progress_bar + name="media_progress_bar" + color_bg="1 1 1 1" + color_bar="1 1 1 0.96" + follows="left|right|top" + height="8" + layout="topleft" + top="0" + left="0" + tool_tip="Media is Loading"/> + </layout_panel> + <layout_panel + name="right_bookend_bottom" + width="0" + mouse_opaque="false" + layout="topleft" + user_resize="false" /> + </layout_stack> + <layout_stack + name="media_controls" + follows="left|right|top" + animate="false" + height="75" + layout="topleft" + top="0" + left="0" + border_size="0" + mouse_opaque="false" + orientation="horizontal"> + <!-- outer layout_panels center the inner one --> + <layout_panel + name="left_bookend" + top="0" + width="0" + mouse_opaque="false" + layout="topleft" + user_resize="false" /> + <layout_panel + name="back" + top="0" + auto_resize="false" + user_resize="false" + layout="topleft" + mouse_opaque="false" + min_width="22" + width="22"> + <button + name="back_btn" + follows="top" + image_overlay="Arrow_Left_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + layout="topleft" + tool_tip="Navigate back" + top="0" + left="0" + width="22" + height="22"> + <button.commit_callback + function="MediaCtrl.Back" /> + </button> + </layout_panel> + <layout_panel + name="fwd" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + min_width="22" + top="0" + height="22" + width="22"> + <button + name="fwd_btn" + follows="top" + image_overlay="Arrow_Right_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + width="22" + layout="topleft" + tool_tip="Navigate forward"> + <button.commit_callback + function="MediaCtrl.Forward" /> + </button> + </layout_panel> + <layout_panel + name="home" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + 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_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip="Home page" + top="0" + height="22" + width="22"> + <button.commit_callback + function="MediaCtrl.Home" /> + </button> + </layout_panel> + <layout_panel + name="media_stop" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="media_stop_btn" + follows="top" + image_overlay="Stop_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip="Stop media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="MediaCtrl.MediaStop" /> + </button> + </layout_panel> + <layout_panel + name="reload" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="reload_btn" + follows="top" + image_overlay="Refresh_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip="Reload" + top="0" + height="22" + width="22"> + <button.commit_callback + function="MediaCtrl.Reload" /> + </button> + </layout_panel> + <layout_panel + name="stop" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="stop_btn" + follows="top" + image_overlay="StopReload_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip = "Stop loading" + top="0" + height="22" + width="22"> + <button.commit_callback + function="MediaCtrl.Stop" /> + </button> + </layout_panel> + <layout_panel + name="play" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="22" + min_width="22" + width="22"> + <button + name="play_btn" + follows="top" + image_overlay="Play_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + tool_tip = "Play media" + top="0" + height="22" + width="22"> + <button.commit_callback + function="MediaCtrl.Play" /> + </button> + </layout_panel> + <layout_panel + name="pause" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="pause_btn" + follows="top" + image_overlay="Pause_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + layout="topleft" + top="0" + height="22" + width="22" + tool_tip = "Pause media"> + <button.commit_callback + function="MediaCtrl.Pause" /> + </button> + </layout_panel> + <!-- media URL entry --> + <layout_panel + name="media_address" + mouse_opaque="false" + auto_resize="true" + user_resize="false" + height="24" + follows="left|right|bottom" + layout="topleft" + top="0" + width="190" + min_width="90"> + <line_editor + name="media_address_url" + max_length="1024" + follows="top|left|right" + height="22" + top="0" + tool_tip="Media URL" + text_pad_right="16"> + <line_editor.commit_callback + function="MediaCtrl.CommitURL"/> + </line_editor> + <layout_stack + name="media_address_url_icons" + animate="false" + follows="top|right" + height="20" + width="38" + top="0" + right="-1" + border_size="0" + mouse_opaque="false" + orientation="horizontal"> + <layout_panel + layout="topleft" + width="16" + mouse_opaque="false" + auto_resize="false" + user_resize="false"> + <icon + name="media_whitelist_flag" + follows="top|right" + height="16" + image_name="Flag" + layout="topleft" + tool_tip="White List enabled" + width="16" /> + </layout_panel> + <layout_panel + layout="topleft" + width="16" + mouse_opaque="false" + auto_resize="false" + user_resize="false"> + <icon + name="media_secure_lock_flag" + height="16" + image_name="Lock2" + layout="topleft" + tool_tip="Secured Browsing" + width="16" /> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + name="media_play_position" + mouse_opaque="false" + auto_resize="true" + user_resize="false" + follows="left|right" + layout="topleft" + top="0" + height="22" + min_width="100" + width="200"> + <slider_bar + name="media_play_slider" + follows="left|right|top" + top="0" + height="22" + increment="0.01" + initial_value="0.5" + layout="topleft" + tool_tip="Movie play progress" + width="200"> + <slider_bar.commit_callback + function="MediaCtrl.JumpProgress" /> + </slider_bar> + </layout_panel> + <layout_panel + name="skip_back" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="skip_back_btn" + follows="top" + image_overlay="SkipBackward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + auto_resize="false" + height="22" + layout="topleft" + tool_tip="Step back" + top="0" + width="22" + left="0"> + <button.commit_callback + function="MediaCtrl.SkipBack" /> + </button> + </layout_panel> + <layout_panel + name="skip_forward" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="skip_forward_btn" + follows="top" + image_overlay="SkipForward_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + height="22" + layout="topleft" + tool_tip="Step forward" + top="0" + width="22"> + <button.commit_callback + function="MediaCtrl.SkipForward" /> + </button> + </layout_panel> + <layout_panel + name="media_volume" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="72" + min_width="22" + width="22"> + <!-- Note: this is not quite right either...the mute button is not the --> + <!-- same as the others because it cannot have the "image_overlay" be --> + <!-- 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" + is_toggle="true" + layout="topleft" + scale_image="false" + tool_tip="Mute This Media" + top="0" + height="20" + width="22" > + <button.commit_callback + function="MediaCtrl.ToggleMute" /> + <button.mouseenter_callback + function="MediaCtrl.ShowVolumeSlider" /> + <button.mouseleave_callback + function="MediaCtrl.HideVolumeSlider" /> + </button> + <slider + orientation="vertical" + left="0" + top="16" + height="50" + layout="topleft" + increment="0.01" + initial_value="0.5" + name="volume_slider" + tool_tip="Media Volume" + show_text="false" + volume="true"> + <slider.commit_callback + function="MediaCtrl.Volume"/> + <slider.mouseenter_callback + function="MediaCtrl.ShowVolumeSlider" /> + <slider.mouseleave_callback + function="MediaCtrl.HideVolumeSlider" /> + </slider> + </layout_panel> + <layout_panel + name="zoom_frame" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + height="28" + min_width="22" + width="22"> + <button + name="zoom_frame_btn" + follows="top" + image_overlay="Zoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip="Zoom into media" + width="22"> + <button.commit_callback + function="MediaCtrl.Zoom" /> + </button> + </layout_panel> + <layout_panel + name="close" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="21" + width="21" > + <button + name="close_btn" + follows="top" + image_overlay="UnZoom_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + top="0" + height="22" + layout="topleft" + tool_tip ="Zoom Back" + top_delta="-4" + width="21" > + <button.commit_callback + function="MediaCtrl.Close" /> + </button> + </layout_panel> + <layout_panel + name="new_window" + mouse_opaque="false" + auto_resize="false" + user_resize="false" + layout="topleft" + top="0" + min_width="22" + width="22"> + <button + name="new_window_btn" + follows="top" + image_overlay="ExternalBrowser_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + hover_glow_amount="0.15" + height="22" + layout="topleft" + tool_tip = "Open URL in browser" + top="0" + width="24" > + <button.commit_callback + function="MediaCtrl.Open" /> + </button> + </layout_panel> + <!-- bookend panel --> + <layout_panel + name="right_bookend" + mouse_opaque="false" + top="0" + width="0" + layout="topleft" + user_resize="false" /> + </layout_stack> + <panel + name="media_region" + height="100" + follows="left|right|top|bottom" + layout="topleft" + mouse_opaque="false" + top="30" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index a4363d5858..78b192d4af 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,574 +1,467 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - background_visible="true" - bevel_style="in" - bg_alpha_color="0.5 0.5 0.5 1" - follows="left|top|right|bottom" - height="705" + follows="all" + height="430" label="Profile" layout="topleft" - left="10" - mouse_opaque="false" + left="0" name="panel_profile" - top="10" - width="355"> - <panel.string + top="0" + width="317"> + <string name="CaptionTextAcctInfo"> - [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] - </panel.string> - <panel.string - name="AcctTypeResident"> - Resident. - </panel.string> - <panel.string - name="AcctTypeTrial"> - Trial - </panel.string> - <panel.string - name="AcctTypeCharterMember"> - Charter Member - </panel.string> - <panel.string - name="AcctTypeEmployee"> - Linden Lab Employee - </panel.string> - <panel.string - name="PaymentInfoUsed"> - Payment Info Used - </panel.string> - <panel.string - name="PaymentInfoOnFile"> - Payment Info On File - </panel.string> - <panel.string - name="NoPaymentInfoOnFile"> - No Payment Info On File - </panel.string> - <panel.string - name="AgeVerified"> - Age-verified - </panel.string> - <panel.string - name="NotAgeVerified"> - Not Age-verified - </panel.string> - <scroll_container - follows="left|top|right|bottom" - height="690" + [ACCTTYPE] +[PAYMENTINFO] [AGEVERIFICATION] + </string> + <string + name="payment_update_link_url"> + http://www.secondlife.com/account/billing.php?lang=en + </string> + <string + name="partner_edit_link_url"> + http://www.secondlife.com/account/partners.php?lang=en + </string> + <string + name="my_account_link_url" + value="http://secondlife.com/account" /> + <string + name="no_partner_text" + value="None" /> + <string + name="no_group_text" + value="None" /> + <string + name="RegisterDateFormat"> + [REG_DATE] ([AGE]) + </string> + <layout_stack + name="layout" + orientation="vertical" + follows="all" layout="topleft" - left="1" - name="profile_scroll" - width="354"> - <panel - height="710" + left="0" + top="0" + height="400" + width="317" + border_size="0"> + <layout_panel + name="profile_stack" + follows="all" layout="topleft" - left="0" top="0" - width="320"> - <panel - follows="left|top" - height="120" - layout="topleft" - left="9" - name="lifes_images_panel" - top_pad="15" - width="250"> - <panel - follows="left|top" - height="120" - layout="topleft" - left="0" - name="second_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="first_life_photo_title_text" - text_color="white" - top="0" - width="125"> - Second Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="2nd_life_pic" - top_pad="5" - width="105" /> - </panel> - <panel - follows="left|top" - height="120" - layout="topleft" - left_pad="1" - name="first_life_image_panel" - top="0" - width="125"> - <text - type="string" - follows="left|top|right|bottom" - font="SansSerifBold" - height="20" - layout="topleft" - left="0" - name="second_life_photo_title_text" - text_color="white" - top="0" - width="125"> - First Life photo: - </text> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="105" - layout="topleft" - left="0" - name="1st_life_pic" - top_pad="5" - width="105" /> - </panel> - </panel> + left="0" + height="400" + width="317"> + <scroll_container + color="DkGray2" + follows="all" + layout="topleft" + left="0" + name="profile_scroll" + opaque="true" + height="527" + width="317" + top="0"> + <panel + layout="topleft" + follows="left|top|right" + height="505" + min_height="505" + name="profile_scroll_panel" + top="0" + left="0" + width="297"> <panel - follows="left|top|right" - height="30" - layout="topleft" - left="0" - name="status_panel" - top="135" - width="300"> - <text - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="online_status" - text_color="green" - width="100" /> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="status_message" - text_color="0.1 0.1 0.1 1" - width="300"> - <!--TBD--> - </text> + follows="left|top|right" + height="124" + layout="topleft" + left="13" + name="second_life_image_panel" + top="0" + width="297"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="Generic_Person_Large" + follows="top|left" + height="124" + layout="topleft" + left="0" + name="2nd_life_pic" + top="10" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" + name="title_sl_descr_text" + text_color="white" + top_delta="0" + value="[SECOND_LIFE]:" + width="180" /> + <expandable_text + follows="left|top|right" + height="97" + layout="topleft" + left="107" + textbox.max_length="512" + textbox.show_context_menu="true" + name="sl_description_edit" + top_pad="-3" + translate="false" + width="180" + expanded_bg_visible="true" + expanded_bg_color="DkGray"> + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean 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. + </expandable_text> </panel> <panel follows="left|top|right" - height="80" + height="124" layout="topleft" - left="0" - name="status_me_panel" - top="135" - width="300"> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="online_me_status_text" - text_color="white" - width="100"> - Status: - </text> - <combo_box - font="SansSerifBold" - height="18" - layout="topleft" - left="10" - name="status_combo" - width="150"> - <combo_box.item - label="Online" - value="online" /> - <combo_box.item - label="Away" - value="away" /> - <combo_box.item - label="Busy" - value="busy" /> - </combo_box> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="status_me_message_text" - text_color="white" - width="300"> - What're you up to? - </text> - <line_editor - type="string" - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerifBold" - font.style="ITALIC" - height="20" - layout="topleft" - left="9" - name="status_me_message_edit" - select_on_focus="true" - text_color="0.5 0.5 0.5 1" - width="300"> - Type a message about what you're doing in SL! - </line_editor> + top_pad="0" + left="13" + name="first_life_image_panel" + width="297"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + fallback_image="Generic_Person_Large" + follows="top|left" + height="124" + layout="topleft" + left="0" + name="real_world_pic" + width="102" /> + <text + follows="left|top|right" + font.style="BOLD" + height="15" + layout="topleft" + left_pad="10" + name="title_rw_descr_text" + text_color="white" + top_delta="0" + value="Real World:" + width="180" /> + <expandable_text + follows="left|top|right" + height="97" + layout="topleft" + left="107" + textbox.max_length="512" + textbox.show_context_menu="true" + name="fl_description_edit" + top_pad="-3" + translate="false" + width="180" + 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. + </expandable_text> </panel> <text - type="string" - - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_sl_descr_text" - text_color="white" - top_pad="10" - width="290"> - Second Life description: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerif" - height="45" - layout="topleft" - left="9" - name="sl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" - word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_fl_descr_text" - text_color="white" - top_pad="10" - width="290"> - First Life description: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerif" - height="45" - layout="topleft" - left="9" - name="fl_description_edit" - text_color="0.1 0.1 0.1 1" - width="290" - word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_groups_text" - text_color="white" - top_pad="10" - width="290"> - Second Life groups: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerif" - height="45" - layout="topleft" - left="9" - name="sl_groups" - text_color="0.1 0.1 0.1 1" - width="290" - word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="9" - name="title_homepage_text" - text_color="white" - top_pad="10" - width="100"> - Homepage: - </text> + follows="left|top" + height="15" + font.style="BOLD" + font="SansSerifMedium" + layout="topleft" + left="10" + name="homepage_edit" + top_pad="0" + translate="false" + value="http://librarianavengers.org" + width="300" + word_wrap="false" + use_ellipses="true" /> <text - type="string" - follows="left|top|right" - font="SansSerif" - font.style="UNDERLINE" - height="15" - layout="topleft" - left="9" - name="homepage_edit" - text_color="0.2 0.2 1 1" - width="290"> - TODO - </text> - <text - type="string" follows="left|top" - font="SansSerifBold" - height="15" + font.style="BOLD" + height="10" layout="topleft" - left="9" + left="10" name="title_member_text" text_color="white" top_pad="10" - width="100"> - Member since: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerif" + value="Resident Since:" + width="300" /> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" height="15" layout="topleft" - left="9" + left="10" name="register_date" - text_color="0.1 0.1 0.1 1" - width="290" - word_wrap="true"> - 05/31/1976 - </text> + read_only="true" + translate="false" + v_pad="0" + value="05/31/2376" + width="300" + word_wrap="true" /> <text - type="string" follows="left|top" - font="SansSerifBold" + font.style="BOLD" height="15" layout="topleft" - left="9" + left="10" name="title_acc_status_text" text_color="white" - top_pad="10" - width="100"> - Account status: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerif" - height="30" + top_pad="5" + value="Account Status:" + width="300" /> + <!-- <text + type="string" + follows="left|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="10" + name="my_account_link" + top_delta="0" + value="Go to Dashboard" + width="100"/> --> + <text_editor + allow_scroll="false" + bg_visible="false" + follows="left|top" + h_pad="0" + height="28" layout="topleft" - left="9" + left="10" name="acc_status_text" - text_color="0.1 0.1 0.1 1" - width="290" + read_only="true" + top_pad="0" + translate="false" + v_pad="0" + width="300" word_wrap="true"> - Resident. No payment info on file. - </text> - <panel - follows="left|top|right" - height="15" - layout="topleft" - left="9" - name="account_actions_panel" - width="335"> - <text - type="string" - follows="left|top" - font="SansSerif" - font.style="UNDERLINE" - height="15" - layout="topleft" - left="0" - name="my_account_link" - text_color="0.2 0.2 1 1" - top="0" - width="65"> - Update - </text> - <text - type="string" - follows="left|top" - font="SansSerif" - font.style="UNDERLINE" - height="15" - layout="topleft" - left="70" - name="my_account_link" - text_color="0.2 0.2 1 1" - top="0" - width="80"> - My Account - </text> - </panel> + Resident. No payment info on file. + Linden. + </text_editor> <text - type="string" follows="left|top" - font="SansSerifBold" + font.style="BOLD" height="15" layout="topleft" + left="10" name="title_partner_text" text_color="white" - top_pad="10" - width="100"> - Partner: - </text> + top_pad="3" + value="Partner:" + width="300" /> <panel - follows="left|top|right" + follows="left|top" height="15" layout="topleft" - left="9" + left="10" name="partner_data_panel" - width="335"> - <text - type="string" - follows="left|top|right" - font="SansSerif" - height="15" - layout="topleft" - left="0" - name="partner_text" - text_color="0.1 0.1 0.1 1" - top="0" - width="290" - word_wrap="true"> - [FIRST] [LAST] - </text> - <text - type="string" - follows="top|right" - font="SansSerif" - font.style="UNDERLINE" - halign="right" - height="15" - layout="topleft" - left="270" - name="partner_edit_link" - text_color="0.2 0.2 1 1" - top="0" - width="40"> - Edit - </text> - </panel> - <panel - follows="left|top" - height="30" - layout="topleft" - name="profile_buttons_panel" - width="350"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Add Friend" - layout="topleft" - left="5" - mouse_opaque="false" - name="add_friend" - top="0" - width="75" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="IM" - layout="topleft" - left_pad="5" - name="im" - top_delta="0" - width="40" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Call" - layout="topleft" - left_pad="5" - name="call" - top_delta="0" - width="50" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Teleport" - layout="topleft" - left_pad="5" - name="teleport" - top_delta="0" - width="65" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Share" - layout="topleft" - left_pad="15" - name="share" - top_delta="0" - width="50" /> + top_pad="0" + width="300"> + <name_box + follows="left|top" + height="10" + initial_value="(retrieving)" + layout="topleft" + left="0" + link="true" + name="partner_text" + top="0" + width="300" + word_wrap="true" /> </panel> - <panel + <text follows="left|top" - height="30" + font.style="BOLD" + height="13" layout="topleft" - name="profile_me_buttons_panel" - visible="false" - width="350"> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit Profile" - layout="topleft" - left="0" - name="edit_profile_btn" - top="0" - width="105" /> - <button - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Edit Appearance" - layout="topleft" - left_pad="15" - name="edit_appearance_btn" - top_delta="0" - width="130" /> - </panel> - </panel> - </scroll_container> + left="10" + name="title_groups_text" + text_color="white" + top_pad="3" + value="Groups:" + width="300" /> + <expandable_text + follows="all" + height="103" + layout="topleft" + left="7" + name="sl_groups" + textbox.max_length="512" + textbox.show_context_menu="true" + top_pad="0" + translate="false" + 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. + </expandable_text> + </panel> + </scroll_container> + </layout_panel> + +</layout_stack> + + <layout_stack + name="layout_verb_buttons" + orientation="horizontal" + follows="bottom|left|right" + layout="topleft" + left="2" + top_pad="1" + height="30" + width="315" + border_size="0"> + <layout_panel + follows="bottom|left" + height="30" + layout="topleft" + name="profile_buttons_panel" + top="0" + auto_resize="false" + width="317"> + + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + name="bottom_bar_ls" + left="0" + orientation="horizontal" + top_pad="5" + width="317"> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + name="add_friend_btn_lp" + user_resize="false" + auto_resize="true" + width="121"> + <button + follows="bottom|left|right" + height="23" + label="Add Friend" + layout="topleft" + left="1" + mouse_opaque="false" + name="add_friend" + tool_tip="Offer friendship to the Resident" + top="0" + width="120" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="im_btn_lp" + user_resize="false" + auto_resize="true" + width="22"> + <button + follows="bottom|left|right" + height="23" + label="IM" + layout="topleft" + name="im" + tool_tip="Open instant message session" + top="0" + left="1" + width="21" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="call_btn_lp" + user_resize="false" + auto_resize="true" + width="52"> + <button + follows="bottom|left|right" + height="23" + label="Call" + layout="topleft" + name="call" + tool_tip="Call this Resident" + left="1" + top="0" + use_ellipses="true" + width="51" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="chat_btn_lp" + user_resize="false" + auto_resize="true" + width="93"> + <button + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + name="teleport" + tool_tip="Offer teleport" + left="1" + top="0" + use_ellipses="true" + width="92" /> + </layout_panel> + + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + name="overflow_btn_lp" + user_resize="false" + auto_resize="false" + width="24"> + <button + follows="bottom|left|right" + height="23" + label="▼" + layout="topleft" + name="overflow_btn" + tool_tip="Pay money to or share inventory with the Resident" + left="1" + top="0" + width="23" /> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel + follows="bottom|left" + height="30" + layout="topleft" + name="profile_me_buttons_panel" + visible="false" + width="313"> + <button + follows="bottom|right" + height="23" + left="20" + top="0" + label="Edit Profile" + name="edit_profile_btn" + tool_tip="Edit your personal information" + width="130" /> + </layout_panel> + </layout_stack> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index fa919776a7..3b4d6ae58d 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -1,64 +1,92 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1" - follows="left|top|right|bottom" - height="660" - label="Me" + follows="all" + height="570" layout="topleft" - left="0" + min_height="350" name="panel_target_profile" - top="0" - width="355"> - <button - layout="topleft" - name="back" - left="0" - top="5" - width="20" - height="20" - label="" - follows="top|left" - image_selected="navbar_bg_button.tga" - image_unselected="navbar_bg_button.tga" - image_overlay="navbar_back.tga"/> - <text - layout="topleft" - top="0" - left="30" - width="150" - height="20" - font="SansSerifHugeBold" - text_color="white" - follows="top|left" - mouse_opaque="true" - name="user_name">(Loading...)</text> + left="0" + width="333"> + <string + name="status_online"> + Online + </string> + <string + name="status_offline"> + Offline + </string> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + name="back" + left="10" + tab_stop="false" + top="2" + width="30" /> + <text_editor + h_pad="0" + v_pad="0" + allow_scroll="false" + bg_visible="false" + read_only = "true" + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="5" + name="user_name" + text_color="LtGray" + top="2" + value="(Loading...)" + use_ellipses="true" + width="275" /> + <text + follows="top|left" + height="13" + layout="topleft" + left="45" + name="status" + text_color="LtGray_50" + value="Online" + width="150" /> <tab_container - follows="left|top|right|bottom" - height="600" + follows="all" + height="515" + halign="center" layout="topleft" - left="0" - name="profile_tabs" + left="5" + min_width="333" + name="tabs" + tab_min_width="80" + tab_height="30" tab_position="top" - top="35" - width="355"> + top_pad="5" + width="317"> <panel class="panel_profile" filename="panel_profile.xml" - label="Profile" + label="PROFILE" layout="topleft" - name="panel_profile"/> + help_topic="profile_profile_tab" + name="panel_profile" /> <panel class="panel_picks" filename="panel_picks.xml" - label="Picks" + label="PICKS" layout="topleft" - name="panel_picks"/> - <panel + help_topic="profile_picks_tab" + name="panel_picks" /> + <panel class="panel_notes" filename="panel_notes.xml" - label="Notes" + label="NOTES & PRIVACY" layout="topleft" - name="panel_notes"/> + help_topic="profile_notes_tab" + name="panel_notes" /> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index 6139bae874..2868d91cc7 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -34,6 +34,7 @@ height="768" layout="topleft" left="0" + orientation="vertical" name="stack2" top="0" width="640"> @@ -54,35 +55,36 @@ color="LoginProgressBoxCenterColor" follows="left|right|bottom|top" height="250" - image_name="rounded_square.tga" + image_name="Rounded_Square" layout="topleft" left="0" top="0" width="640" /> <text follows="left|right|top" - font="SansSerif" - font_shadow="hard" - halign="center" + font="SansSerifHuge" + font_shadow="none" + halign="left" height="20" layout="topleft" - left_delta="0" + left_delta="47" name="title_text" text_color="LoginProgressBoxTextColor" top_delta="50" - width="640" /> + width="593" /> <text follows="left|right|top" font="SansSerif" - font_shadow="hard" - halign="center" + font_shadow="none" + halign="left" height="20" layout="topleft" left_delta="0" name="progress_text" text_color="LoginProgressBoxTextColor" top_pad="5" - width="640" /> + width="593" + word_wrap="true"/> <progress_bar bottom="115" color_bar="1 1 1 0.96" @@ -94,17 +96,18 @@ right="-45" /> <text follows="left|right|top|bottom" - font="SansSerif" - font_shadow="hard" - halign="center" + font="SansSerifLarge" + font_shadow="none" + halign="left" height="100" layout="topleft" - left="20" - line_spacing="8" + left="45" + line_spacing.pixels="2" name="message_text" text_color="LoginProgressBoxTextColor" top="145" - width="600" /> + width="550" + word_wrap="true"/> </layout_panel> <layout_panel height="200" @@ -125,9 +128,8 @@ follows="right|bottom" height="22" layout="topleft" - left="-86" + left="-106" name="cancel_btn" - picture_style="true" - top="730" - width="70" /> + top="700" + width="90" /> </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 7bd548d464..2b2ea78fac 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -3,6 +3,7 @@ border="true" follows="top|left" height="320" + help_topic="panel_region_covenant_tab" label="Covenant" layout="topleft" left="0" @@ -26,8 +27,6 @@ Purchased land in this region may not be joined or subdivided. </panel.string> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -40,8 +39,6 @@ Estate </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -53,8 +50,6 @@ Name: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -66,8 +61,6 @@ mainland </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -79,8 +72,6 @@ Owner: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -91,23 +82,18 @@ width="150"> (none) </text> - - <text - type="string" - length="1" + <text follows="left|top" - height="20" + height="20" layout="topleft" left="10" - mouse_opaque="false" - name="estate_cov_lbl" + mouse_opaque="false" + name="estate_cov_lbl" top_pad="5" width="100"> Covenant: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -118,20 +104,7 @@ width="308"> Last Modified Wed Dec 31 16:00:00 1969 </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="5" - name="covenant_help" - top_delta="-2" - width="18" /> - <text_editor - type="string" - length="1" enabled="false" follows="left|top" height="100" @@ -146,7 +119,6 @@ </text_editor> <button follows="left|top" - font="SansSerifSmall" height="18" label="Reset" layout="topleft" @@ -156,33 +128,30 @@ width="90" /> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" 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 - type="string" - length="1" follows="left|top" height="16" layout="topleft" 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 - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -195,8 +164,6 @@ Region </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -208,8 +175,6 @@ Name: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -218,11 +183,9 @@ name="region_name_text" top_delta="0" width="150"> - leyla + Erica </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -234,8 +197,6 @@ Type: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -247,8 +208,6 @@ Mainland / Homestead </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -260,8 +219,6 @@ Rating: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -273,8 +230,6 @@ Adult </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -286,8 +241,6 @@ Resale: </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -299,8 +252,6 @@ Land in this region may not be resold. </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -312,8 +263,6 @@ Subdivide: </text> <text - type="string" - length="1" follows="left|top" height="30" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 22dc0aa0d0..a6b4ddd01e 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -3,6 +3,7 @@ border="true" follows="top|left" height="320" + help_topic="panel_region_debug_tab" label="Debug" layout="topleft" left="0" @@ -10,8 +11,6 @@ top="320" width="480"> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -23,8 +22,6 @@ Region: </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -44,16 +41,6 @@ tool_tip="Disable all scripts in this region" top="30" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="70" - name="disable_scripts_help" - top_delta="2" - width="18" /> <check_box height="20" label="Disable Collisions" @@ -63,16 +50,6 @@ tool_tip="Disable non-avatar collisions in this region" top="50" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="70" - name="disable_collisions_help" - top_delta="2" - width="18" /> <check_box height="20" label="Disable Physics" @@ -83,16 +60,6 @@ top="70" width="80" /> <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="70" - name="disable_physics_help" - top_delta="2" - width="18" /> - <button enabled="false" follows="left|top" height="20" @@ -103,8 +70,7 @@ top="100" width="100" /> <text - type="string" - length="1" + follows="left|top" height="20" layout="topleft" @@ -115,8 +81,7 @@ Object Return </text> <text - type="string" - length="1" + follows="left|top" height="20" layout="topleft" @@ -127,8 +92,7 @@ Resident: </text> <line_editor - type="string" - length="1" + border_style="line" border_thickness="1" enabled="false" @@ -145,15 +109,13 @@ <button follows="left|top" height="20" - label="Choose..." + label="Choose" layout="topleft" - left_pad="10" + left_pad="5" name="choose_avatar_btn" top_delta="0" - width="80" /> + width="70" /> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -163,18 +125,18 @@ width="60"> Options: </text> - <check_box + <check_box height="20" - label="Return only those objects with scripts" + label="With scripts" layout="topleft" left_delta="60" name="return_scripts" - tool_tip="Return only objects which have scripts." + tool_tip="Return only objects which have scripts" top_delta="0" width="80" /> <check_box height="20" - label="Return only those objects on someone else's land" + label="On someone else's land" layout="topleft" left_delta="0" name="return_other_land" @@ -183,7 +145,7 @@ width="80" /> <check_box height="20" - label="Return objects in every region of this estate" + label="In every region of this estate" layout="topleft" left_delta="0" name="return_estate_wide" @@ -195,7 +157,7 @@ height="20" label="Return" layout="topleft" - left="30" + left="20" name="return_btn" top="263" width="80" /> @@ -211,16 +173,6 @@ width="150" /> <button follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="top_colliders_help" - top_delta="2" - width="18" /> - <button - follows="left|top" height="20" label="Get Top Scripts..." layout="topleft" @@ -231,16 +183,6 @@ width="150" /> <button follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="top_scripts_help" - top_delta="2" - width="18" /> - <button - follows="left|top" height="20" label="Restart Region" layout="topleft" @@ -251,16 +193,6 @@ width="130" /> <button follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="restart_help" - top_delta="2" - width="18" /> - <button - follows="left|top" height="20" label="Delay Restart" layout="topleft" 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 95e1456c6e..08e36d5e57 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" + border="false" follows="top|left" - height="320" + height="510" + help_topic="panel_region_estate_tab" label="Estate" layout="topleft" left="0" name="Estate" top="320" - width="480"> - <panel.string - name="email_unsupported"> - Feature unsupported - </panel.string> + width="530"> <text type="string" length="1" @@ -22,9 +19,9 @@ left="10" name="estate_help_text" top="14" + word_wrap="true" width="300"> - Changes to settings on this tab will affect all -regions in the estate. + Changes to settings on this tab will affect all regions in the estate. </text> <text type="string" @@ -36,7 +33,7 @@ regions in the estate. left_delta="0" name="estate_text" top_pad="2" - width="80"> + width="140"> Estate: </text> <text @@ -62,8 +59,8 @@ regions in the estate. left_delta="0" name="owner_text" top_pad="2" - width="80"> - Owner: + width="150"> + Estate owner: </text> <text type="string" @@ -81,11 +78,11 @@ regions in the estate. <view_border bevel_style="in" follows="top|left" - height="290" + height="270" layout="topleft" left_delta="-4" top_pad="5" - width="250" /> + width="300" /> <check_box height="20" label="Use Global Time" @@ -94,16 +91,6 @@ regions in the estate. name="use_global_time_check" top="132" width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="use_global_time_help" - top_delta="2" - width="18" /> <check_box height="20" label="Fixed Sun" @@ -112,16 +99,6 @@ regions in the estate. name="fixed_sun_check" top="152" width="100" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="120" - name="fixed_sun_help" - top_delta="2" - width="18" /> <icon height="20" image_name="icon_day_cycle.tga" @@ -151,16 +128,6 @@ regions in the estate. name="externally_visible_check" top_pad="6" width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="externally_visible_help" - top_delta="2" - width="18" /> <text type="string" length="1" @@ -171,26 +138,26 @@ regions in the estate. name="Only Allow" top="250" width="278"> - Restrict Access To: + Restrict Access to accounts verified by: </text> <check_box follows="top|left" height="16" - label="Residents with payment info on file" + label="Payment Information on File" 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 follows="top|left" height="16" - label="Age-verified adults" + label="Age Verification" layout="topleft" left_delta="0" name="limit_age_verified" - tool_tip="Ban residents who have not verified their age. See support.secondlife.com 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 @@ -201,16 +168,6 @@ regions in the estate. name="voice_chat_check" top="304" width="200" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="20" - name="voice_chat_help" - top_delta="2" - width="18" /> <check_box height="20" label="Allow Direct Teleport" @@ -220,73 +177,33 @@ regions in the estate. top_pad="4" width="80" /> <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="140" - name="allow_direct_teleport_help" - top_delta="2" - width="18" /> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="abuse_email_text" - top_pad="5" - width="180"> - Abuse email address: - </text> - <line_editor - follows="top|left" - height="19" - layout="topleft" - left="15" - name="abuse_email_address" - top_pad="5" - width="205" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="12" - name="abuse_email_address_help" - top_dekta="0" - width="18" /> - <button enabled="false" follows="left|top" - height="20" + height="23" label="Apply" layout="topleft" name="apply_btn" - right="250" - top_pad="4" - width="90" /> + top_pad="10" + left="110" + width="97" /> <button follows="left|top" - height="20" + height="23" label="Send Message To Estate..." layout="topleft" - left="8" + left="45" name="message_estate_btn" - top_pad="5" - width="250" /> + top_pad="20" + width="220" /> <button follows="left|top" - height="20" - label="Kick User from Estate..." + height="23" + label="Kick Resident from Estate..." layout="topleft" - left="8" + left="45" name="kick_user_from_estate_btn" top_pad="5" - width="250" /> + width="220" /> <text type="string" @@ -296,31 +213,21 @@ regions in the estate. height="20" layout="topleft" name="estate_manager_label" - right="470" + right="520" width="200"> Estate Managers: </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="182" - name="estate_manager_help" - top_delta="-1" - width="18" /> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" - right="470" - top_pad="5" + right="520" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -329,22 +236,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_estate_manager_btn" - right="470" + right="520" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_estate_manager_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -353,31 +260,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_resident_label" - top_pad="5" + top_pad="10" width="200"> Allowed Residents: </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="182" - name="allow_resident_help" - top_delta="-1" - width="18" /> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" - right="470" - top_pad="5" + right="520" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -386,22 +283,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_avatar_btn" - right="470" + right="520" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_avatar_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -410,31 +307,21 @@ regions in the estate. layout="topleft" left_delta="0" name="allow_group_label" - top_pad="5" + top_pad="10" width="200"> Allowed Groups: </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="182" - name="allow_group_help" - top_delta="-1" - width="18" /> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" - right="470" - top_pad="5" + right="520" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -443,22 +330,22 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_allowed_group_btn" - right="470" + right="520" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_allowed_group_btn" top_delta="0" - width="90" /> + width="97" /> <text type="string" length="1" @@ -467,31 +354,21 @@ regions in the estate. layout="topleft" left_delta="0" name="ban_resident_label" - top_pad="5" + top_pad="10" width="200"> Banned Residents: </text> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_delta="182" - name="ban_resident_help" - top_delta="-1" - width="18" /> <view_border bevel_style="none" follows="top|left" - height="60" + height="71" layout="topleft" - right="470" - top_pad="5" + right="520" + top_pad="-5" width="200" /> <name_list follows="left|top" - height="60" + height="71" layout="topleft" left_delta="0" multi_select="true" @@ -500,20 +377,20 @@ regions in the estate. width="200" /> <button follows="left|top" - height="20" + height="23" label="Remove..." layout="topleft" name="remove_banned_avatar_btn" - right="470" + right="520" top_pad="5" - width="90" /> + width="97" /> <button follows="left|top" - height="20" + height="23" label="Add..." layout="topleft" - left_delta="-110" + left_delta="-103" name="add_banned_avatar_btn" top_delta="0" - width="90" /> + width="97" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 661cb97c66..ca9579284b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -3,6 +3,7 @@ border="true" follows="top|left" height="320" + help_topic="panel_region_general_tab" label="Region" layout="topleft" left="0" @@ -10,8 +11,6 @@ top="320" width="480"> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -23,8 +22,6 @@ Region: </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -36,8 +33,6 @@ unknown </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -49,8 +44,6 @@ Version: </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -62,8 +55,6 @@ unknown </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -75,8 +66,6 @@ Type: </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -95,16 +84,6 @@ name="block_terraform_check" top="70" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="terraform_help" - top_delta="2" - width="18" /> <check_box height="20" label="Block Fly" @@ -113,16 +92,6 @@ name="block_fly_check" top="90" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="fly_help" - top_delta="2" - width="18" /> <check_box height="20" label="Allow Damage" @@ -131,16 +100,6 @@ name="allow_damage_check" top="110" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="damage_help" - top_delta="2" - width="18" /> <check_box height="20" label="Restrict Pushing" @@ -149,16 +108,6 @@ name="restrict_pushobject" top="130" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="restrict_pushobject_help" - top_delta="2" - width="18" /> <check_box height="20" label="Allow Land Resell" @@ -167,16 +116,6 @@ name="allow_land_resell_check" top="160" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="land_resell_help" - top_delta="2" - width="18" /> <check_box height="20" label="Allow Land Join/Divide" @@ -185,16 +124,6 @@ name="allow_parcel_changes_check" top="180" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="parcel_changes_help" - top_delta="2" - width="18" /> <check_box height="20" label="Block Land Show in Search" @@ -204,17 +133,8 @@ tool_tip="Let people see this region and its parcels in search results" top="200" width="80" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="115" - name="parcel_search_help" - top_delta="2" - width="18" /> <spinner + decimal_digits="0" follows="left|top" height="20" increment="1" @@ -227,16 +147,6 @@ name="agent_limit_spin" top="240" width="170" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="25" - name="agent_limit_help" - top_delta="2" - width="18" /> <spinner follows="left|top" height="20" @@ -250,19 +160,7 @@ name="object_bonus_spin" top="260" width="170" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="25" - name="object_bonus_help" - top_delta="2" - width="18" /> <text - type="string" - length="1" follows="left|top" height="20" label="Maturity" @@ -273,34 +171,51 @@ width="100"> Rating: </text> - <combo_box + <icons_combo_box + follows="left|top" height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" top_delta="0" - width="85"> - <combo_box.item + width="105"> + <icons_combo_box.drop_down_button + image_overlay="Parcel_M_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item label="Adult" - value="42" /> - <combo_box.item - label="Mature" - value="21" /> - <combo_box.item - label="PG" - value="13" /> - </combo_box> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="access_help" - top_delta="2" - width="18" /> + name="Adult" + value="42"> + <item.columns + halign="center" + type="icon" + value="Parcel_R_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item + label="Moderate" + name="Mature" + value="21"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item + label="General" + name="PG" + value="13"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> <button enabled="false" follows="left|top" @@ -310,11 +225,11 @@ left="108" name="apply_btn" top="320" - width="100" /> + width="100"/> <button follows="left|top" height="20" - label="Teleport Home One User..." + label="Teleport Home One Resident..." layout="topleft" left="10" name="kick_btn" @@ -323,7 +238,7 @@ <button follows="left|top" height="20" - label="Teleport Home All Users..." + label="Teleport Home All Residents..." layout="topleft" left_delta="0" name="kick_all_btn" @@ -346,5 +261,8 @@ left="250" name="manage_telehub_btn" top="70" - width="150" /> + width="150"> + <button.commit_callback + function="RegionInfo.ManageTelehub" /> + </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index ae3b650774..5093c52129 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -3,6 +3,7 @@ border="true" follows="top|left" height="320" + help_topic="panel_region_terrain_tab" label="Terrain" layout="topleft" left="0" @@ -10,8 +11,6 @@ top="320" width="480"> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -23,8 +22,6 @@ Region: </text> <text - type="string" - length="1" follows="left|top" font="SansSerif" height="20" @@ -46,16 +43,6 @@ name="water_height_spin" top="40" width="180" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="5" - name="water_height_help" - top_delta="2" - width="18" /> <spinner follows="left|top" height="20" @@ -68,16 +55,6 @@ name="terrain_raise_spin" top="60" width="180" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="5" - name="terrain_raise_help" - top_delta="2" - width="18" /> <spinner follows="left|top" height="20" @@ -91,16 +68,6 @@ name="terrain_lower_spin" top="80" width="180" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="5" - name="terrain_lower_help" - top_delta="2" - width="18" /> <check_box height="20" label="Use Estate Sun" @@ -109,16 +76,6 @@ name="use_estate_sun_check" top="35" width="100" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="70" - name="use_estate_sun_help" - top_delta="2" - width="18" /> <check_box height="20" label="Fixed Sun" @@ -127,16 +84,6 @@ name="fixed_sun_check" top="55" width="100" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="70" - name="fixed_sun_help" - top_delta="2" - width="18" /> <icon height="20" image_name="icon_day_cycle.tga" @@ -188,16 +135,6 @@ width="170" /> <button follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="download_raw_help" - top_delta="2" - width="18" /> - <button - follows="left|top" height="20" label="Upload RAW terrain..." layout="topleft" @@ -208,16 +145,6 @@ width="170" /> <button follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="upload_raw_help" - top_delta="2" - width="18" /> - <button - follows="left|top" height="20" label="Bake Terrain" layout="topleft" @@ -226,14 +153,4 @@ tool_tip="Set current terrain as mid-point for raise/lower limits" top="283" width="100" /> - <button - follows="left|top" - font="SansSerifSmall" - height="18" - label="?" - layout="topleft" - left_pad="10" - name="bake_terrain_help" - top_delta="2" - width="18" /> </panel> 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 f24630f4e3..5d910ea659 100644 --- a/indra/newview/skins/default/xui/en/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml @@ -3,6 +3,7 @@ border="true" follows="top|left" height="320" + help_topic="panel_region_texture_tab" label="Ground Textures" layout="topleft" left="0" @@ -135,25 +136,21 @@ layout="topleft" left="10" name="height_text_lbl5" - top="186" + top="170" width="300"> Texture Elevation Ranges </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" left="51" name="height_text_lbl6" - top="201" + top="185" width="100"> - Southwest + Northwest </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -161,23 +158,75 @@ name="height_text_lbl7" top_delta="0" width="100"> - Northwest + Northeast </text> +<!-- northwest low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_start_spin_1" + top_delta="15" + width="100" /> +<!-- northeast low--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="Low" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_start_spin_3" + top_delta="0" + width="100" /> +<!-- northwest high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left="10" + max_val="500" + min_val="-500" + name="height_range_spin_1" + top_delta="20" + width="100" /> +<!-- northeast high--> + <spinner + follows="left|top" + height="20" + increment="0.5" + label="High" + label_width="37" + layout="topleft" + left_pad="10" + max_val="500" + min_val="-500" + name="height_range_spin_3" + top_delta="0" + width="100" /> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" - left_pad="10" + left="51" name="height_text_lbl8" - top_delta="0" + top_pad="10" width="100"> - Southeast + Southwest </text> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" @@ -185,8 +234,9 @@ name="height_text_lbl9" top_delta="0" width="100"> - Northeast + Southeast </text> +<!-- southwest low--> <spinner follows="left|top" height="20" @@ -198,21 +248,9 @@ max_val="500" min_val="-500" name="height_start_spin_0" - top="221" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_1" - top_delta="0" + top_delta="15" width="100" /> +<!-- southeast low--> <spinner follows="left|top" height="20" @@ -226,19 +264,7 @@ name="height_start_spin_2" top_delta="0" width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="Low" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_start_spin_3" - top_delta="0" - width="100" /> +<!--southwest high--> <spinner follows="left|top" height="20" @@ -250,21 +276,9 @@ max_val="500" min_val="-500" name="height_range_spin_0" - top="241" - width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_1" - top_delta="0" + top_delta="20" width="100" /> +<!-- southeast high--> <spinner follows="left|top" height="20" @@ -278,55 +292,28 @@ name="height_range_spin_2" top_delta="0" width="100" /> - <spinner - follows="left|top" - height="20" - increment="0.5" - label="High" - label_width="37" - layout="topleft" - left_pad="10" - max_val="500" - min_val="-500" - name="height_range_spin_3" - top_delta="0" - width="100" /> <text - type="string" - length="1" follows="left|top" height="20" layout="topleft" - left="25" + left="10" name="height_text_lbl10" - top="281" - width="480"> - These values represent the blend range for the textures above. + top_delta="30" + width="400" + word_wrap="true"> + These values represent the blend range for the textures above. </text> <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="height_text_lbl11" - top_delta="16" - width="450"> - Measured in meters, the LOW value is the MAXIMUM height of Texture #1, - </text> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left_delta="0" - name="height_text_lbl12" - top_delta="16" - width="480"> - and the HIGH value is the MINIMUM height of Texture #4. - </text> + follows="left|top" + height="20" + layout="topleft" + left_delta="0" + name="height_text_lbl11" + top_delta="32" + width="400" + 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 enabled="false" follows="left|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index 5a452bd706..c5c66c04d5 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -1,190 +1,181 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- bevel_style="none"
- border_style="line"
- bottom="550"
- follows="left|top|right|bottom"
- height="508"
- layout="topleft"
- left="0"
- name="script panel"
- width="500">
- <panel.string
- name="loading">
- Loading...
- </panel.string>
- <panel.string
- name="can_not_view">
- You are not allowed to view this script.
- </panel.string>
- <panel.string
- name="public_objects_can_not_run">
- Public Objects cannot run scripts
- </panel.string>
- <panel.string
- name="script_running">
- Running
- </panel.string>
- <panel.string
- name="Title">
- Script: [NAME]
- </panel.string>
- <text_editor
- type="string"
- length="1"
- bevel_style="none"
- border_style="line"
- bottom="393"
- follows="left|top|right|bottom"
- font="Monospace"
- height="376"
- ignore_tab="false"
- layout="topleft"
- left="4"
- max_length="65536"
- name="Script Editor"
- width="492"
- word_wrap="true">
- Loading...
- </text_editor>
- <button
- bottom="499"
- follows="right|bottom"
- height="20"
- label="Save"
- label_selected="Save"
- layout="topleft"
- left="360"
- name="Save_btn"
- width="128" />
- <scroll_list
- bottom="457"
- follows="left|right|bottom"
- height="60"
- layout="topleft"
- left="4"
- name="lsl errors"
- width="492" />
- <combo_box
- bottom="499"
- follows="left|bottom"
- height="20"
- label="Insert..."
- layout="topleft"
- left="12"
- name="Insert..."
- width="128" />
- <text
- bottom="473"
- follows="left|bottom"
- height="12"
- layout="topleft"
- left="12"
- name="line_col"
- width="128" />
- <menu_bar
- bg_visible="false"
- bottom="18"
- follows="left|top|right"
- height="18"
- layout="topleft"
- left="8"
- mouse_opaque="false"
- name="script_menu"
- width="476">
- <menu
- bottom="18"
- height="62"
- label="File"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="File"
- width="138">
- <menu_item_call
- label="Save"
- layout="topleft"
- name="Save" />
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- label="Revert All Changes"
- layout="topleft"
- name="Revert All Changes" />
- </menu>
- <menu
- bottom="-647"
- height="198"
- label="Edit"
- layout="topleft"
- left="222"
- mouse_opaque="false"
- name="Edit"
- width="139">
- <menu_item_call
- enabled="false"
- label="Undo"
- layout="topleft"
- name="Undo" />
- <menu_item_call
- enabled="false"
- label="Redo"
- layout="topleft"
- name="Redo" />
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- enabled="false"
- label="Cut"
- layout="topleft"
- name="Cut" />
- <menu_item_call
- enabled="false"
- label="Copy"
- layout="topleft"
- name="Copy" />
- <menu_item_call
- enabled="false"
- label="Paste"
- layout="topleft"
- name="Paste" />
- <menu_item_separator
- layout="topleft"
- name="separator2" />
- <menu_item_call
- label="Select All"
- layout="topleft"
- name="Select All" />
- <menu_item_call
- enabled="false"
- label="Deselect"
- layout="topleft"
- name="Deselect" />
- <menu_item_separator
- layout="topleft"
- name="separator3" />
- <menu_item_call
- label="Search / Replace..."
- layout="topleft"
- name="Search / Replace..." />
- </menu>
- <menu
- bottom="18"
- height="34"
- label="Help"
- layout="topleft"
- left="0"
- mouse_opaque="false"
- name="Help"
- width="112">
- <menu_item_call
- label="Help..."
- layout="topleft"
- name="Help..." />
- <menu_item_call
- label="LSL Wiki Help..."
- layout="topleft"
- name="LSL Wiki Help..." />
- </menu>
- </menu_bar>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bevel_style="none" + border_style="line" + follows="left|top|right|bottom" + height="522" + layout="topleft" + left="0" + name="script panel" + width="497"> + <panel.string + name="loading"> + Loading... + </panel.string> + <panel.string + name="can_not_view"> + You can not view or edit this script, since it has been set as "no copy". You need full permissions to view or edit a script inside an object. + </panel.string> + <panel.string + name="public_objects_can_not_run"> + Public Objects cannot run scripts + </panel.string> + <panel.string + name="script_running"> + Running + </panel.string> + <panel.string + name="Title"> + Script: [NAME] + </panel.string> + <menu_bar + bg_visible="false" + follows="left|top" + height="18" + layout="topleft" + left="0" + mouse_opaque="false" + name="script_menu" + width="476"> + <menu + top="0" + height="62" + label="File" + layout="topleft" + left="0" + mouse_opaque="false" + name="File" + width="138"> + <menu_item_call + label="Save" + layout="topleft" + name="Save" /> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Revert All Changes" + layout="topleft" + name="Revert All Changes" /> + </menu> + <menu + top="0" + height="198" + label="Edit" + layout="topleft" + mouse_opaque="false" + name="Edit" + width="139"> + <menu_item_call + enabled="false" + label="Undo" + layout="topleft" + name="Undo" /> + <menu_item_call + enabled="false" + label="Redo" + layout="topleft" + name="Redo" /> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Cut" + layout="topleft" + name="Cut" /> + <menu_item_call + enabled="false" + label="Copy" + layout="topleft" + name="Copy" /> + <menu_item_call + enabled="false" + label="Paste" + layout="topleft" + name="Paste" /> + <menu_item_separator + layout="topleft" + name="separator2" /> + <menu_item_call + label="Select All" + layout="topleft" + name="Select All" /> + <menu_item_call + enabled="false" + label="Deselect" + layout="topleft" + name="Deselect" /> + <menu_item_separator + layout="topleft" + name="separator3" /> + <menu_item_call + label="Search / Replace..." + layout="topleft" + name="Search / Replace..." /> + </menu> + <menu + top="0" + height="34" + label="Help" + layout="topleft" + mouse_opaque="false" + name="Help" + width="112"> + <menu_item_call + label="Help..." + layout="topleft" + name="Help..." /> + <menu_item_call + label="Keyword Help..." + layout="topleft" + name="Keyword Help..." /> + </menu> + </menu_bar> + <text_editor + left="0" + type="string" + length="1" + follows="left|top|right|bottom" + font="Monospace" + height="376" + ignore_tab="false" + layout="topleft" + max_length="65536" + name="Script Editor" + width="487" + show_line_numbers="true" + word_wrap="true"> + Loading... + </text_editor> + <scroll_list + top_pad="10" + left="0" + follows="left|right|bottom" + height="60" + layout="topleft" + name="lsl errors" + width="487" /> + <text + follows="left|bottom" + height="12" + layout="topleft" + left="0" + name="line_col" + width="128" /> + <combo_box + follows="left|bottom" + height="23" + label="Insert..." + layout="topleft" + name="Insert..." + width="128" /> + <button + follows="right|bottom" + height="23" + label="Save" + label_selected="Save" + layout="topleft" + top_pad="-35" + right="487" + name="Save_btn" + width="81" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml new file mode 100644 index 0000000000..629d8567d1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="570" + label="MY AVATAR" + layout="topleft" + left="0" + name="script_limits_my_avatar_panel" + top="0" + width="480"> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="script_memory" + top_pad="24" + text_color="White" + width="480"> + Avatar Script Usage + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="memory_used" + top_delta="18" + width="480"> + + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="urls_used" + top_delta="18" + width="480"> + + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="loading_text" + top="80" + text_color="EmphasisColor" + width="480"> + Loading... + </text> + <scroll_list + draw_heading="true" + follows="all" + height="415" + layout="topleft" + left_delta="0" + multi_select="true" + name="scripts_list" + top="100" + width="460"> + <scroll_list.columns + label="Size (kb)" + name="size" + width="70" /> + <scroll_list.columns + label="URLs" + name="urls" + width="50" /> + <scroll_list.columns + label="Object Name" + name="name" + width="140" /> + <scroll_list.columns + label="Location" + name="location" + width="130" /> + </scroll_list> + <button + follows="bottom|left" + height="19" + label="Refresh List" + layout="bottomleft" + left_pad="5" + name="refresh_list_btn" + top="34" + left="10" + width="100" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml new file mode 100644 index 0000000000..c5e8bf5803 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="true" + follows="top|left" + height="570" + label="REGION MEMORY" + layout="topleft" + name="script_limits_region_memory_panel" + top="0" + left="0" + width="480"> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="script_memory" + top_pad="24" + text_color="White" + width="480"> + Parcel Script Memory + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="parcels_listed" + top_delta="18" + visible="true" + width="480"> + + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="memory_used" + top_delta="18" + width="480"> + </text> + + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="30" + name="urls_used" + top_delta="18" + width="480"> + + </text> + <text + type="string" + length="1" + follows="left|top" + height="20" + layout="topleft" + left="10" + name="loading_text" + top_delta="12" + text_color="EmphasisColor" + width="480"> + Loading... + </text> + <scroll_list + draw_heading="true" + follows="all" + height="409" + layout="topleft" + left_delta="0" + multi_select="true" + sort_column="0" + sort_ascending="true" + name="scripts_list" + top_delta="16" + width="460"> + <scroll_list.columns + label="Size (kb)" + name="size" + width="72" /> + <scroll_list.columns + label="URLs" + name="urls" + width="48" /> + <scroll_list.columns + label="Object Name" + name="name" + width="100" /> + <scroll_list.columns + label="Object Owner" + name="owner" + width="100" /> + <scroll_list.columns + label="Parcel" + name="parcel" + width="130" /> + <scroll_list.columns + label="Location" + name="location" + width="80" /> + </scroll_list> + <button + follows="bottom|left" + height="19" + label="Refresh List" + layout="bottomleft" + left_pad="5" + name="refresh_list_btn" + top="34" + left="10" + width="100" /> + <button + follows="bottom|right" + height="19" + label="Highlight" + visible="false" + layout="bottomright" + left="370" + name="highlight_btn" + top="34" + width="100" /> + <button + follows="bottom|right" + height="19" + label="Return" + visible="false" + layout="bottomright" + name="return_btn" + top="34" + left_delta="-105" + width="100" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index 2805ace906..a8cd380f20 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -1,34 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - height="152" + height="157" layout="topleft" left="0" name="LLScrollingPanelParam" top="152" - width="270"> + width="290"> <text follows="left|top" height="16" layout="topleft" - left="4" + left="12" name="min param text" - top="116" - width="128" /> + text_color="White" + font_shadow="hard" + top="120" + width="120" /> <text follows="left|top" height="16" layout="topleft" - left_pad="6" + left="155" name="max param text" + text_color="White" + font_shadow="hard" top_delta="0" - width="128" /> + width="120" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="8" + left="12" name="Loading..." top="11" width="128"> @@ -40,37 +44,65 @@ follows="left|top" height="16" layout="topleft" - left_pad="6" + left="155" name="Loading...2" top_delta="0" width="128"> Loading... </text> + <view_border + layout="topleft" + follows="left|top" + left="7" + top="5" + width="132" + height="132" + thickness="2" + shadow_light_color="0.3 0.3 0.3 1" + highlight_light_color="0.3 0.3 0.3 1" + highlight_dark_color="0.3 0.3 0.3 1" + shadow_dark_color="0.3 0.3 0.3 1" + bevel_style="in" + name="left_border" + /> + <view_border + layout="topleft" + follows="left|top" + left_pad="10" + top_delta="0" + width="132" + height="132" + thickness="2" + shadow_light_color="0.3 0.3 0.3 1" + highlight_light_color="0.3 0.3 0.3 1" + highlight_dark_color="0.3 0.3 0.3 1" + shadow_dark_color="0.3 0.3 0.3 1" + bevel_style="in" + name="right_border" + /> <button enabled="false" height="132" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_unselected="square_btn_32x128.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" layout="topleft" - left="2" + left="7" name="less" - picture_style="true" tab_stop="false" - top="0" + top="5" width="132" /> <button enabled="false" height="132" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_unselected="square_btn_32x128.tga" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" layout="topleft" - left_pad="2" + left_pad="10" name="more" - picture_style="true" tab_stop="false" top_delta="0" width="132" /> @@ -82,11 +114,11 @@ increment="1" initial_value="0" label="[DESC]" - label_width="100" - layout="topleft" + layout="bottom|left" left="6" max_val="100" name="param slider" - top="134" - width="258" /> + bottom="1" + width="274" + slider_label.font.style="BOLD" /> </panel> 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 220191ddaa..6ef93406ec 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -1,95 +1,173 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<side_tray - name="sidebar" - background_visible="false" - bg_opaque_color="0.0 0.0 0.0 0.0" - mouse_opaque="true" +<!-- Side tray cannot show background because it is always + partially on screen to hold tab buttons. --> +<side_tray + name="sidebar" + background_visible="false" + mouse_opaque="true" + width="333" collapsed="true" > - <sidetray_tab - name="sidebarpanel2" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" + <!-- Individual tabs must show background to have seemless + 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_Home_Off" + image_selected="TabIcon_Home_Selected" + mouse_opaque="false" + background_visible="true" + > + <panel + class="panel_sidetray_home" + name="panel_home" + filename="panel_sidetray_home_tab.xml" + label="home" + /> + </sidetray_tab> + + <sidetray_tab + name="sidebar_me" + help_topic="sidebar_me" + tab_title="My Profile" + description="Edit your public profile and Picks." + image="TabIcon_Me_Off" + image_selected="TabIcon_Me_Selected" + mouse_opaque="false" + background_visible="true" + > + <panel_container + name="panel_container" + default_panel_name="panel_me" + width="333" + > + <panel + class="panel_me" + name="panel_me" + filename="panel_me.xml" + label="Me" + /> + + </panel_container> + </sidetray_tab> + + <sidetray_tab + name="sidebar_people" + help_topic="sidebar_people" tab_title="People" description="Find your friends, contacts and people nearby." + image="TabIcon_People_Off" + image_selected="TabIcon_People_Selected" + mouse_opaque="false" + background_visible="true" > - <collapsible_ctrl - name="people_accordion" - title="People" - collapsable="true" - min_width="200" - min_height="200" - expanded="true" - header_visible="false" + <panel_container + name="panel_container" + default_panel_name="panel_people" + width="333" > - <panel - class="panel_people" - name="panel_people" - filename="panel_people.xml" - width="355" - height="465" - label="People" - border="true" + <panel + class="panel_people" + name="panel_people" + filename="panel_people.xml" + /> + <panel + class="panel_profile_view" + name="panel_profile_view" + filename="panel_profile_view.xml" /> - </collapsible_ctrl> + <panel + class="panel_group_info_sidetray" + name="panel_group_info_sidetray" + filename="panel_group_info_sidetray.xml" + label="Group Profile" + font="SansSerifBold" + /> + <panel + class="panel_block_list_sidetray" + name="panel_block_list_sidetray" + filename="panel_block_list_sidetray.xml" + label="Blocked Residents & Objects" + font="SansSerifBold" + /> + + </panel_container> </sidetray_tab> - - <sidetray_tab - name="sidebarpanel1" - mouse_opaque="false" - background_visible="true" - label="Places" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="inv_item_landmark.tga" - tab_title="Places" - description="Find places to go and places you've been." + + <sidetray_tab + name="sidebar_places" + help_topic="sidebar_places" + tab_title="Places" + label="Places" + description="Find places to go and places you've visited before." + image="TabIcon_Places_Off" + image_selected="TabIcon_Places_Selected" + mouse_opaque="false" + background_visible="true" > - <collapsible_ctrl - name="places_accordian" - title="Places" - collapsable="true" - min_width="355" - min_height="570" - header_visible="false" - > - <panel - class="panel_places" - name="panel_places" - filename="panel_places.xml" - label="Places" - border="true" + <panel + class="panel_places" + name="panel_places" + filename="panel_places.xml" + label="Places" + font="SansSerifBold" /> - </collapsible_ctrl> </sidetray_tab> - - <sidetray_tab - name="sidebar_me" - mouse_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-pvtfocus.tga" - tab_title="Me" - description="Change your profile, your look and quick links to your outfits." + + <sidetray_tab + name="sidebar_inventory" + help_topic="sidebar_inventory" + tab_title="My Inventory" + description="Browse your inventory." + image="TabIcon_Things_Off" + image_selected="TabIcon_Things_Selected" + mouse_opaque="false" + background_visible="true" > - <collapsible_ctrl - name="me_accordion" - title="Me" - collapsable="false" - min_width="200" - min_height="200" - header_visible="false" - > - <panel - class="panel_me_profile" - name="panel_me_profile" - filename="panel_me_profile.xml" - label="Me" - border="true" + <panel + class="sidepanel_inventory" + name="sidepanel_inventory" + filename="sidepanel_inventory.xml" + label="Edit Inventory" + font="SansSerifBold" /> - </collapsible_ctrl> - </sidetray_tab> -</side_tray> + </sidetray_tab> + <sidetray_tab + name="sidebar_appearance" + help_topic="sidebar_appearance" + tab_title="My Appearance" + description="Change your appearance and current look." + image="TabIcon_Appearance_Off" + image_selected="TabIcon_Appearance_Selected" + mouse_opaque="false" + background_visible="true" + > + <panel + class="sidepanel_appearance" + name="sidepanel_appearance" + filename="sidepanel_appearance.xml" + label="Edit Appearance" + font="SansSerifBold" + /> + </sidetray_tab> + +</side_tray> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index e447e541e0..557b04d281 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -1,15 +1,62 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="sidetray_tab_panel" - bottom="0" height="25" left="0" background_visible="false" - bg_visible="false" border="false" border_visible="false" - bg_opaque_color="0.7 0.3 0.7 1.0" - follows="left|top|right" - mouse_opaque="true"> - <text type="string" length="1" bg_visible="false" border_visible="false" - bottom="0" enabled="true" follows="left|top" - height="20" left="10" - font="SansSerifBold" halign="left" - name="sidetray_tab_title" width="100"> - Side Panel - </text> -</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bottom="0" + follows="left|top|right" + height="30" + width="333" + layout="topleft" + left="0" + name="sidetray_tab_panel"> + <text + follows="left|top|right" + font="SansSerifHuge" + height="16" + layout="topleft" + left="10" + name="sidetray_tab_title" + text_color="white" + top="4" + value="Side Panel" + width="255" /> + <button + follows="right|top" + height="16" + image_selected="Sidebar_Icon_Undock_Press" + image_unselected="Sidebar_Icon_Undock_Foreground" + image_disabled="Sidebar_Icon_Undock_Press" + layout="topleft" + name="undock" + top="10" + right="-28" + width="16" + tool_tip="Undock" /> + <button + follows="right|top" + height="16" + image_selected="Sidebar_Icon_Dock_Press" + image_unselected="Sidebar_Icon_Dock_Foreground" + image_disabled="Sidebar_Icon_Dock_Press" + layout="topleft" + name="dock" + top="10" + right="-28" + width="16" + tool_tip="Dock" + visible="false" /> + <button + follows="right|top" + height="16" + image_selected="Icon_Help_Press" + image_unselected="Icon_Help_Foreground" + image_disabled="Icon_Help_Press" + layout="topleft" + name="show_help" + top="10" + right="-11" + width="16" + tool_tip="Show Help"> + <button.commit_callback + function="Button.ShowHelp" /> + </button> +</panel> 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 new file mode 100644 index 0000000000..72b2f5e84f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- the web-based Home panel of the side tray --> +<panel + follows="all" + height="570" + min_height="350" + help_topic="sidetray_home" + layout="topleft" + top="0" + left="0" + name="home_tab" + width="333"> + <layout_stack + follows="all" + height="550" + layout="topleft" + left="10" + name="stack" + top_pad="10" + orientation="vertical" + width="313"> + <layout_panel + height="550" + layout="topleft" + left_delta="0" + name="browser_layout" + orientation="vertical" + top_delta="0" + width="313"> + <web_browser + trusted_content="true" + border_visible="false" + follows="all" + height="550" + layout="topleft" + left="0" + name="browser" + start_url="data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#2A2A2A%22 text=%22eeeeee%22%3E %3Ch3%3E %0D%0A%0D%0ALoading... %3C/h3%3E %3C/body%3E%3C/html%3E" + top="0" + width="313" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml new file mode 100644 index 0000000000..07642946f8 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> +<panel + height="25" + layout="topleft" + name="panel_stand_stop_flying" + mouse_opaque="false" + visible="true" + width="133"> + <button + follows="left|bottom" + height="19" + label="Stand" + layout="topleft" + left="10" + name="stand_btn" + tool_tip="Click here to stand up." + top="2" + visible="false" + width="113" /> + <button + follows="left|bottom" + height="19" + label="Stop Flying" + layout="topleft" + left="10" + name="stop_fly_btn" + tool_tip="Stop flying" + top="2" + visible="false" + width="113" /> +</panel> 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 3709514147..2f52ca660b 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -2,24 +2,18 @@ <panel background_opaque="true" background_visible="true" - bg_opaque_color="0.25 0.25 0.25 1" - follows="top|left|right" - height="18" + bg_opaque_color="MouseGray" + chrome="true" + follows="top|right" + height="19" layout="topleft" left="0" mouse_opaque="false" name="status" - top="18" + top="19" + tab_stop="false" width="1000"> <panel.string - name="StatBarDaysOfWeek"> - Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday - </panel.string> - <panel.string - name="StatBarMonthsOfYear"> - January:February:March:April:May:June:July:August:September:October:November:December - </panel.string> - <panel.string name="packet_loss_tooltip"> Packet Loss </panel.string> @@ -35,218 +29,93 @@ name="timeTooltip"> [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt] </panel.string> + <panel.string + name="buycurrencylabel"> + L$ [AMT] + </panel.string> + <panel + height="18" + left="-315" + width="95" + top="1" + follows="right|top" + name="balance_bg" + bg_visible="true" + background_opaque="true" + bg_opaque_image="bevel_background"> + <text + auto_resize="true" + halign="center" + font="SansSerifSmall" + follows="all" + height="18" + left="0" + name="balance" + tool_tip="My Balance" + v_pad="4" + top="0" + wrap="false" + value="L$20" + width="40" /> <button auto_resize="true" - follows="right|bottom" + halign="center" font="SansSerifSmall" - height="16" - layout="topleft" - left="-130" - name="buycurrency" - picture_style="true" - tool_tip="Account Balance / Buy currency" - top="1" - width="60" /> + follows="right|top|bottom" + image_hover_unselected="buy_over" + image_unselected="buy_off" + image_pressed="buy_press" + height="18" + label="BUY L$" + label_color="White" + left_pad="0" + label_shadow="true" + name="buyL" + pad_right="0" + pad_bottom="2" + tool_tip="Click to buy more L$" + top="0" + width="55" /> + </panel> <text type="string" - length="1" - disabled_color="TimeTextColor" - follows="right|bottom" + font="SansSerifSmall" + text_readonly_color="TimeTextColor" + follows="right|top" halign="right" - height="20" - layout="topleft" - left_pad="5" - name="TimeText" - text_color="TimeTextColor" - tool_tip="Current Time (Pacific)" - top_delta="-1" - v_pad="2" - width="60"> - 12:00 AM - </text> - <button - follows="right|bottom" height="16" - image_selected="status_script_debug.tga" - image_unselected="status_script_debug.tga" - layout="topleft" - left_delta="-557" - name="scriptout" - picture_style="true" - scale_image="false" - tool_tip="Script Warnings and Errors" - top_delta="2" - visible="false" - width="16" /> - <button - follows="right|bottom" - height="18" - image_selected="status_health.tga" - image_unselected="status_health.tga" - layout="topleft" - left_delta="16" - name="health" - picture_style="true" - scale_image="false" - tool_tip="Health" - top_delta="2" - visible="false" - width="24" /> - <text - type="string" - length="1" - disabled_color="HealthTextColor" - follows="rsight|bottom" - font_shadow="hard" - height="18" + top="5" layout="topleft" - left_delta="24" - name="HealthText" - text_color="HealthTextColor" - tool_tip="Health" - top_delta="-4" - v_pad="2" - visible="false" - width="31"> - 100% + left_pad="0" + name="TimeText" + tool_tip="Current time (Pacific)" + width="145"> + 24:00 AM PST </text> <button - follows="right|bottom" - height="18" - image_selected="status_no_fly.tga" - image_unselected="status_no_fly.tga" - layout="topleft" - left_delta="31" - name="no_fly" - picture_style="true" - scale_image="false" - tool_tip="Flying not allowed" - top_delta="4" - visible="false" - width="24" /> - <button - follows="right|bottom" - height="18" - image_selected="status_no_build.tga" - image_unselected="status_no_build.tga" - layout="topleft" - left_delta="24" - name="no_build" - picture_style="true" - scale_image="false" - tool_tip="Building/Rezzing not allowed" - top_delta="0" - visible="false" - width="24" /> - <button - follows="right|bottom" - height="18" - image_selected="status_no_scripts.tga" - image_unselected="status_no_scripts.tga" - layout="topleft" - left_delta="24" - name="no_scripts" - picture_style="true" - scale_image="false" - tool_tip="Scripts not allowed" - top_delta="0" - visible="false" - width="24" /> - <button - follows="right|bottom" - height="18" - image_selected="status_no_push.tga" - image_unselected="status_no_push.tga" - layout="topleft" - left_delta="24" - name="restrictpush" - picture_style="true" - scale_image="false" - tool_tip="No Pushing" - top_delta="0" - visible="false" - width="24" /> - <button - follows="right|bottom" - height="18" - image_selected="status_no_voice.tga" - image_unselected="status_no_voice.tga" - layout="topleft" - left_delta="24" - name="status_no_voice" - picture_style="true" - scale_image="false" - tool_tip="Voice not available here" - top_delta="0" - visible="false" - width="24" /> - <button - follows="right|bottom" + follows="right|top" height="16" - image_selected="status_buy_land_pressed.tga" - image_unselected="status_buy_land.tga" - layout="topleft" - left_pad="7" - name="buyland" - picture_style="true" - tool_tip="Buy this parcel" - top_delta="-3" - visible="false" - width="16" /> - <button - follows="right|bottom" - height="16" - image_disabled="sm_rounded_corners_simple.tga" - image_disabled_selected="sm_rounded_corners_simple.tga" - image_hover_selected="sm_rounded_corners_simple.tga" - image_hover_unselected="sm_rounded_corners_simple.tga" - image_selected="sm_rounded_corners_simple.tga" - image_unselected="sm_rounded_corners_simple.tga" - layout="topleft" - left_pad="313" - mouse_opaque="false" - name="menubar_search_bevel_bg" - picture_style="true" - top_delta="0" - width="94" /> - <line_editor - bevel_style="none" - border_style="line" - commit_on_focus_lost="false" - follows="right|bottom" - height="11" - label="Search" - layout="topleft" - left_delta="1" - name="search_editor" - tab_group="1" - tool_tip="Search Second Life" - top_delta="4" - width="78" /> + image_selected="Play_Off" + image_unselected="Pause_Off" + image_pressed="Pause_Press" + image_pressed_selected="Play_Press" + is_toggle="true" + left_pad="15" + top="1" + name="media_toggle_btn" + tool_tip="Start/Stop All Media (Music, Video, Web pages)" + width="16" > + </button> <button - follows="right|bottom" - font="SansSerifSmall" + follows="right|top" height="16" - image_disabled="status_search_btn.png" - image_disabled_selected="status_search_btn_pressed.png" - image_selected="status_search_btn_pressed.png" - image_unselected="status_search_btn.png" - layout="topleft" - left_delta="78" - name="search_btn" - picture_style="true" - scale_image="false" - tool_tip="Search Second Life" - top_delta="-4" + image_selected="AudioMute_Off" + image_pressed="Audio_Press" + image_unselected="Audio_Off" + is_toggle="true" + left_pad="5" + top="2" + name="volume_btn" + tool_tip="Global Volume Control" width="16" /> - <text - enabled="false" - follows="right|bottom" - halign="center" - height="12" - layout="topleft" - left_delta="-4" - name="stat_btn" - top_delta="3" - width="20" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml new file mode 100644 index 0000000000..5e74689c5a --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> +<panel + translate="false" + name="sys_well_item" + title="sys_well_item" + visible="true" + top="0" + left="0" + width="300" + height="35" + layout="topleft" + follows="left|right" + background_opaque="false" + background_visible="true" + bg_alpha_color="0.0 0.0 0.0 0.0" > + <text + clip_partial="true" + top="2" + left="10" + width="267" + height="28" + layout="topleft" + follows="right|left" + text_color="white" + use_ellipses="true" + word_wrap="true" + mouse_opaque="false" + name="title" > + Beware the trout. BEWARE! THE! TROUT! + </text> + <button + top="5" + right="-5" + width="17" + height="17" + layout="topleft" + follows="right" + name="close_btn" + mouse_opaque="true" + tab_stop="false" + image_unselected="Icon_Close_Toast" + image_selected="Icon_Close_Toast" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 8f6a2d7648..bf09836e87 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,12 +1,183 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Teleport History" bottom="0" height="326" left="0" width="380" - border="true" follows="left|top|right|bottom"> - <scroll_list bottom="0" can_resize="true" column_padding="0" draw_heading="true" - draw_stripes="false" follows="left|top|bottom|right" left="0" - multi_select="false" name="history_items" search_column="1" - sort_column="1" height="326" width="380" > - <column name="landmark_icon" width="20" /> - <column dynamicwidth="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> -</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel name="Teleport History" bottom="0" height="400" left="0" width="313" + help_topic="panel_teleport_history" + border="false" follows="left|top|right|bottom" + background_visible="true" + bg_alpha_color="DkGray"> + <accordion + follows="left|top|right|bottom" + height="373" + layout="topleft" + left="3" + top="0" + name="history_accordion" + background_visible="true" + bg_alpha_color="DkGray2" + width="307"> + <no_matched_tabs_text + name="no_matched_teleports_msg" + value="Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]." /> + <no_visible_tabs_text + name="no_teleports_msg" + value="Teleport history is empty. Try [secondlife:///app/search/places/ Search]." /> + <accordion_tab + layout="topleft" + name="today" + title="Today"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="today_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="yesterday" + title="Yesterday"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="yesterday_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="2_days_ago" + title="2 days ago"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="2_days_ago" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="3_days_ago" + title="3 days ago"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="3_days_ago" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="4_days_ago" + title="4 days ago"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="4_days_ago" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="5_days_ago" + title="5 days ago"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="5_days_ago_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="6_days_and_older" + title="6 days and older"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="6_days_and_older_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="1_month_and_older" + title="1 month and older"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="1_month_and_older_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + <accordion_tab + layout="topleft" + name="6_months_and_older" + title="6 months and older"> + <flat_list_view + follows="all" + height="150" + layout="topleft" + left="0" + name="6_months_and_older_items" + top="0" + width="307"> + </flat_list_view> + </accordion_tab> + </accordion> + <panel + background_visible="true" + bevel_style="none" + bottom="0" + follows="left|right|bottom" + height="27" + layout="bottomleft" + left="3" + name="bottom_panel" + width="313"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" + layout="topleft" + left="0" + name="gear_btn" + top="1" + width="31" /> + <icon + follows="bottom|left|right" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="273" + /> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml new file mode 100644 index 0000000000..c89e1dc215 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="20" + layout="topleft" + left="0" + name="teleport_history_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="20" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + height="16" + follows="top|left" + image_name="Inv_Landmark" + layout="topleft" + left="0" + name="landmark_icon" + top="0" + width="16" /> + <text + follows="left|right" + height="20" + layout="topleft" + left_pad="5" + parse_urls="false" + use_ellipses="true" + name="region" + text_color="white" + top="4" + value="..." + width="330" /> + <button + follows="right" + height="20" + image_overlay="ForwardArrow_Off" + layout="topleft" + left_pad="5" + right="-3" + name="profile_btn" + tab_stop="false" + tool_tip="Show item info" + top="1" + visible="false" + width="20" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml new file mode 100644 index 0000000000..42f64c3a76 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- All our XML is utf-8 encoded. --> + +<!-- Don't remove floater's height! It is needed for Overflow and Start-Up toasts!--> + +<!-- + This floater is invisible. To make toast look like a floater we render wrapper_panel + like a floater(draw shadows and so on). This is done with one purpose - make close button + look like it is positioned out of floater and able to accept mouse clicks (see EXT-4246) +--> + +<floater + legacy_header_height="0" + header_height="0" + name="toast" + title="" + visible="false" + layout="topleft" + height="47" + width="310" + left="0" + top="0" + follows="right|bottom" + background_visible="false" + bg_opaque_image="Toast_Over" + bg_alpha_image="Toast_Background" + can_minimize="false" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="false" + border_visible = "false" + border = "false" +> + <panel + background_opaque="false" + border_visible="false" + background_visible="true" + bg_opaque_image="Toast_Over" + bg_alpha_image="Toast_Background" + label="wrapper_panel" + layout="topleft" + left="0" + name="wrapper_panel" + top="7" + height="40" + follows="all" + translate="false" + width="305"> + <!-- Don't remove this wiget! It is needed for Overflow and Start-Up toasts!--> + <text + clip_partial="true" + visible="false" + follows="left|top|right|bottom" + font="SansSerif" + height="20" + layout="topleft" + left="20" + name="toast_text" + word_wrap="true" + text_color="white" + top="5" + translate="false" + use_ellipses="true" + width="260"> + Toast text; + </text> + </panel> + <button + layout="topleft" + top="0" + right="310" + width="17" + height="17" + follows="top|right" + visible="false" + enabled="true" + mouse_opaque="false" + name="hide_btn" + label="" + tab_stop="false" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + /> +</floater> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml new file mode 100644 index 0000000000..30d3064e14 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<panel + background_visible="true" + background_opaque="false" + bg_opaque_color="Black_50" + bg_alpha_color="Black_50" + follows="left|top|right" + height="19" + layout="topleft" + name="topinfo_bar" + width="1024"> + <button + follows="left|top" + height="16" + hover_glow_amount="0.15" + image_disabled="Info_Off" + image_disabled_selected="Info_Off" + image_selected="Info_Off" + image_unselected="Info_Off" + left="11" + name="place_info_btn" + top="1" + width="16"/> + <text + follows="left|top|right" + font="DejaVu" + height="16" + layout="topleft" + left_pad="11" + length="1" + name="parcel_info_text" + top="1" + type="string" + width="1"/> + <icon + enabled="true" + follows="right|top" + height="18" + image_name="Parcel_VoiceNo_Dark" + name="voice_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_FlyNo_Dark" + name="fly_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_PushNo_Dark" + name="push_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_BuildNo_Dark" + name="build_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="18" + image_name="Parcel_ScriptsNo_Dark" + name="scripts_icon" + top="1" + visible="false" + width="22" + /> + <icon + follows="right|top" + height="13" + image_name="Parcel_Health_Dark" + left="2" + name="damage_icon" + top="3" + visible="false" + width="14" + /> + <text + follows="right|top" + font="SansSerifSmall" + halign="right" + height="18" + name="damage_text" + top="5" + visible="false" + width="35" + /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml new file mode 100644 index 0000000000..93e79b7328 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="all" + height="26" + layout="topleft" + name="panel_voice_effect" + width="200"> + <string name="no_voice_effect"> + Voice Morphing Off + </string> + <string name="preview_voice_effects"> + Preview Voice Morphing ▶ + </string> + <string name="get_voice_effects"> + Get Voice Morphing ▶ + </string> + <combo_box + enabled="false" + follows="left|top|right" + height="23" + name="voice_effect" + tool_tip="Select a Voice Morph to change your voice" + top_pad="0" + width="200"> + <combo_box.item + label="Voice Morphing Off" + name="no_voice_effect" + top_pad="0" + value="0" /> + <combo_box.commit_callback + function="Voice.CommitVoiceEffect" /> + </combo_box> +</panel> 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..7b22b2cce1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_opaque="true" + background_visible="true" + bg_opaque_image="Volume_Background" + bg_alpha_image="Volume_Background" + border_visible="false" + border="false" + chrome="true" + follows="bottom" + height="150" + layout="topleft" + name="volumepulldown_floater" + 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="10" + top_pad="9" + width="12" + 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/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml index 532f487780..16860a6117 100644 --- a/indra/newview/skins/default/xui/en/panel_world_map.xml +++ b/indra/newview/skins/default/xui/en/panel_world_map.xml @@ -1,128 +1,128 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|top|right|bottom"
- height="300"
- layout="topleft"
- name="world_map"
- width="400">
- <panel.string
- name="Loading">
- Loading...
- </panel.string>
- <panel.string
- name="InvalidLocation">
- Invalid Location
- </panel.string>
- <panel.string
- name="world_map_north">
- N
- </panel.string>
- <panel.string
- name="world_map_east">
- E
- </panel.string>
- <panel.string
- name="world_map_west">
- W
- </panel.string>
- <panel.string
- name="world_map_south">
- S
- </panel.string>
- <panel.string
- name="world_map_southeast">
- SE
- </panel.string>
- <panel.string
- name="world_map_northeast">
- NE
- </panel.string>
- <panel.string
- name="world_map_southwest">
- SW
- </panel.string>
- <panel.string
- name="world_map_northwest">
- NW
- </panel.string>
- <text
- type="string"
- length="1"
- label="N"
- layout="topleft"
- name="floater_map_north"
- text="N"
- text_color="1 1 1 0.7">
- N
- </text>
- <text
- type="string"
- length="1"
- label="E"
- layout="topleft"
- name="floater_map_east"
- text="E"
- text_color="1 1 1 0.7">
- E
- </text>
- <text
- type="string"
- length="1"
- label="W"
- layout="topleft"
- name="floater_map_west"
- text="W"
- text_color="1 1 1 0.7">
- W
- </text>
- <text
- type="string"
- length="1"
- label="S"
- layout="topleft"
- name="floater_map_south"
- text="S"
- text_color="1 1 1 0.7">
- S
- </text>
- <text
- type="string"
- length="1"
- label="SE"
- layout="topleft"
- name="floater_map_southeast"
- text="SE"
- text_color="1 1 1 0.7">
- SE
- </text>
- <text
- type="string"
- length="1"
- label="NE"
- layout="topleft"
- name="floater_map_northeast"
- text="NE"
- text_color="1 1 1 0.7">
- NE
- </text>
- <text
- type="string"
- length="1"
- label="SW"
- layout="topleft"
- name="floater_map_southwest"
- text="SW"
- text_color="1 1 1 0.7">
- SW
- </text>
- <text
- type="string"
- length="1"
- label="NW"
- layout="topleft"
- name="floater_map_northwest"
- text="NW"
- text_color="1 1 1 0.7">
- NW
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|top|right|bottom" + height="300" + layout="topleft" + name="world_map" + width="400"> + <panel.string + name="Loading"> + Loading... + </panel.string> + <panel.string + name="InvalidLocation"> + Invalid Location + </panel.string> + <panel.string + name="world_map_north"> + N + </panel.string> + <panel.string + name="world_map_east"> + E + </panel.string> + <panel.string + name="world_map_west"> + W + </panel.string> + <panel.string + name="world_map_south"> + S + </panel.string> + <panel.string + name="world_map_southeast"> + SE + </panel.string> + <panel.string + name="world_map_northeast"> + NE + </panel.string> + <panel.string + name="world_map_southwest"> + SW + </panel.string> + <panel.string + name="world_map_northwest"> + NW + </panel.string> + <panel.string + name="world_map_person"> + 1 person + </panel.string> + <panel.string + name="world_map_people"> + [NUMBER] people + </panel.string> + <text + type="string" + length="1" + label="N" + layout="topleft" + name="floater_map_north" + text_color="1 1 1 0.7"> + N + </text> + <text + type="string" + length="1" + label="E" + layout="topleft" + name="floater_map_east" + text_color="1 1 1 0.7"> + E + </text> + <text + type="string" + length="1" + label="W" + layout="topleft" + name="floater_map_west" + text_color="1 1 1 0.7"> + W + </text> + <text + type="string" + length="1" + label="S" + layout="topleft" + name="floater_map_south" + text_color="1 1 1 0.7"> + S + </text> + <text + type="string" + length="1" + label="SE" + layout="topleft" + name="floater_map_southeast" + text_color="1 1 1 0.7"> + SE + </text> + <text + type="string" + length="1" + label="NE" + layout="topleft" + name="floater_map_northeast" + text_color="1 1 1 0.7"> + NE + </text> + <text + type="string" + length="1" + label="SW" + layout="topleft" + name="floater_map_southwest" + text_color="1 1 1 0.7"> + SW + </text> + <text + type="string" + length="1" + label="NW" + layout="topleft" + name="floater_map_northwest" + text_color="1 1 1 0.7"> + NW + </text> +</panel> diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index b89a975430..a6036f8b78 100644 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml @@ -4,39 +4,39 @@ description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership"> <action description="Invite People to this Group" - longdescription="Invite People to this Group using the 'Invite New Person...' button in the Members & Roles tab > Members sub-tab." + longdescription="Invite People to this Group using the 'Invite' button in the Roles section > Members tab." name="member invite" value="1" /> <action description="Eject Members from this Group" - longdescription="Eject Members from this Group using the 'Eject From Group' button in the Members & Roles tab > Members sub-tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." + longdescription="Eject Members from this Group using the 'Eject' button in the Roles section > Members tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." name="member eject" value="2" /> <action - description="Toggle 'Open Enrollment' and change 'Signup Fee'" - longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change 'Signup Fee' in the Group Preferences section of the General tab." + description="Toggle 'Open Enrollment' and change 'Enrollment fee'" + longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change the 'Enrollment fee' in the General section." name="member options" value="3" /> </action_set> <action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles"> <action description="Create new Roles" - longdescription="Create new Roles in the Members & Roles tab > Roles sub-tab." + longdescription="Create new Roles in the Roles section > Roles tab." name="role create" value="4" /> <action description="Delete Roles" - longdescription="Delete Roles in the Members & Roles tab > Roles sub-tab." + longdescription="Delete Roles in the Roles section > Roles tab." name="role delete" value="5" /> - <action description="Change Role names, titles, descriptions, and whether Role members are publicly visible" - longdescription="Change Role names, titles, descriptions, and whether Role members are publicly visible. This is done at the bottom of the the Members & Roles tab > Roles sub-tab after selecting a Role." + <action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" + longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section > Roles tab after selecting a Role." name="role properties" value="6" /> <action description="Assign Members to Assigner's Roles" - longdescription="Assign Members to Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. A Member with this Ability can only add Members to a Role the assigner is already in." + longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section > Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7" /> <action description="Assign Members to Any Role" - longdescription="Assign Members to Any Role in the Assigned Roles section of the Members & Roles tab > Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section > Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role assign member" value="8" /> <action description="Remove Members from Roles" - longdescription="Remove Members from Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. Owners can't be removed." + longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section > Members tab). Owners can't be removed." name="role remove member" value="9" /> <action description="Assign and Remove Abilities in Roles" - longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members & Roles tab > Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section > Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role change actions" value="10" /> </action_set> <action_set @@ -44,11 +44,11 @@ name="Group Identity"> <action description="Change Charter, Insignia, and 'Show in search'" - longdescription="Change Charter, Insignia, and 'Show in search'. This is done in the General tab." + longdescription="Change Charter, Insignia, and 'Show in search'. This is done in the General section." name="group change identity" value="11" /> </action_set> <action_set - description="These Abilities include powers to deed, modify, and sell land in this group's land holdings. To get to the About Land window, right-click the ground and select 'About Land...', or click the parcel info in the menu bar." + description="These Abilities include powers to deed, modify, and sell land in this group's land holdings. To get to the About Land window, right-click the ground and select 'About Land', or click the 'i' icon in the Navigation Bar." name="Parcel Management"> <action description="Deed land and buy land for group" longdescription="Deed land and buy land for group. This is done in About Land > General tab." @@ -60,18 +60,18 @@ longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land > General tab as they wish! Be sure you know what you're doing before assigning this Ability." name="land set sale info" value="14" /> <action description="Subdivide and join parcels" - longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. " + longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide'. To join, select two or more contiguous parcels and click 'Join'. " name="land divide join" value="15" /> </action_set> <action_set description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point & TP routing options." name="Parcel Identity"> - <action description="Toggle 'Show in Find Places' and set category" - longdescription="Toggle 'Show in Find Places' and setting a parcel's category in About Land > Options tab." + <action description="Toggle 'Show Place in Search' and set category" + longdescription="Toggle 'Show Place in Search' and setting a parcel's category in About Land > Options tab." name="land find places" value="17" /> <action - description="Change parcel name, description, and 'Show in search' settings" - longdescription="Change parcel name, description, and 'Show in search' settings. This is done in About Land > Options tab." + description="Change parcel name, description, and 'Show Place in Search' settings" + longdescription="Change parcel name, description, and 'Show Place in Search' settings. This is done in About Land > Options tab." name="land change identity" value="18" /> <action description="Set landing point and set teleport routing" longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land > Options tab." @@ -87,7 +87,7 @@ longdescription="Toggle 'Edit Terrain'. *WARNING* About Land > Options tab > Edit Terrain allows anyone to terraform your land's shape, and place and move Linden plants. Be sure you know what you're doing before assigning this Ability. Editing terrain is toggled in About Land > Options tab." name="land edit" value="21" /> <action description="Toggle various About Land > Options settings" - longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Create Objects', 'Edit Terrain', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab." + longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Edit Terrain', 'Build', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab." name="land options" value="22" /> </action_set> <action_set @@ -106,7 +106,7 @@ longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow landmark" value="26" /> <action description="Allow 'Set Home to Here' on group land" - longdescription="Members in a Role with this Ability can use World menu > Set Home to Here on a parcel deeded to this group." + longdescription="Members in a Role with this Ability can use World menu > Landmarks > Set Home to Here on a parcel deeded to this group." name="land allow set home" value="28" /> </action_set> <action_set @@ -116,13 +116,13 @@ longdescription="Manage parcel Access lists in About Land > Access tab." name="land manage allowed" value="29" /> <action description="Manage parcel Ban lists" - longdescription="Manage parcel Ban lists in About Land > Ban tab." + longdescription="Manage parcel Ban lists in About Land > Access tab." name="land manage banned" value="30" /> - <action description="Change parcel 'Sell passes...' settings" - longdescription="Change parcel 'Sell passes...' settings in About Land > Access tab." + <action description="Change parcel 'Sell passes to' settings" + longdescription="Change parcel 'Sell passes to' settings in About Land > Access tab." name="land manage passes" value="31" /> <action description="Eject and freeze Residents on parcels" - longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More >, and selecting 'Eject...' or 'Freeze...'." + longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting 'Eject' or 'Freeze'." name="land admin" value="32" /> </action_set> <action_set @@ -138,20 +138,20 @@ longdescription="Return objects on group-owned parcels that are non-group in About Land > Objects tab." name="land return non group" value="34" /> <action description="Landscaping using Linden plants" - longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder or they can be created via the Build button." + longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder, or they can be created via the Build menu." name="land gardening" value="35" /> </action_set> <action_set - description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. " + description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools > General tab. Right-click an object and Edit to see its settings. " name="Object Management"> <action description="Deed objects to group" - longdescription="Deed objects to group in the Edit Tools > General Tab." + longdescription="Deed objects to group in the Build Tools > General tab." name="object deed" value="36" /> <action description="Manipulate (move, copy, modify) group-owned objects" - longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools > General Tab." + longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools > General tab." name="object manipulate" value="38" /> <action description="Set group-owned objects for sale" - longdescription="Set group-owned objects for sale in the Edit Tools > General tab." + longdescription="Set group-owned objects for sale in the Build Tools > General tab." name="object set sale" value="39" /> </action_set> <action_set @@ -165,10 +165,10 @@ description="These Abilities include powers to allow Members to send, receive, and view group Notices." name="Notices"> <action description="Send Notices" - longdescription="Members in a Role with this Ability can send Notices in Group Information > Notices tab." + longdescription="Members in a Role with this Ability can send Notices via the Group > Notices section." name="notices send" value="42" /> <action description="Receive Notices and view past Notices" - longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information > Notices tab." + longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group > Notices section." name="notices receive" value="43" /> </action_set> <action_set diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml new file mode 100644 index 0000000000..b5839878d5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel +background_visible="true" +default_tab_group="1" +follows="all" +height="570" +label="Outfits" +layout="topleft" +min_height="350" +min_width="240" +name="appearance panel" +top="0" +left="0" +width="333"> + <string + name="No Outfit" + value="No Outfit" /> + <string + name="Unsaved Changes" + value="Unsaved changes" /> + <string + name="Now Wearing" + value="Now wearing..." /> + <string + name="Changing outfits" + value="Changing outfits" /> + <panel + background_opaque="true" + background_visible="true" + bg_opaque_color="DkGray2" + left="10" + top="5" + follows="left|top|right" + layout="topleft" + width="303" + height="33" + name="panel_currentlook" + > + <button + follows="left|top" + left="205" top="7" width="20" height="20" + label="E" + layout="topleft" + name="editappearance_btn" + visible="false" /> + <button + follows="left|top" + left="235" top="7" width="20" height="20" + label="O" + layout="topleft" + name="openoutfit_btn" + visible="false" /> + <icon + follows="top|left" + height="31" + image_name="Shirt_Large" + name="outfit_icon" + mouse_opaque="false" + visible="true" + left="1" + top="0" + width="31" /> + <text + font="SansSerifSmall" + text_color="EmphasisColor" + width="300" + height="10" + follows="top|left|right" + layout="topleft" + left="35" + top="3" + mouse_opaque="false" + name="currentlook_status" > + (Status) + </text> + <text + font="SansSerifLargeBold" + height="20" + left="35" + parse_urls="false" + text_color="White" + top="15" + use_ellipses="true" + width="230" + follows="top|left|right" + word_wrap="false" + mouse_opaque="false" + name="currentlook_name"> + MyOutfit With a really Long Name like MOOSE + </text> + <button + follows="top|right" + height="28" + image_overlay="Edit_Wrench" + label="" + layout="topleft" + left="265" + name="edit_outfit_btn" + tool_tip="Edit this outfit" + top="3" + width="28" /> + <loading_indicator + follows="top|right" + height="24" + layout="topleft" + left="268" + name="wearables_loading_indicator" + top="6" + width="24" /> + </panel> + <filter_editor + height="23" + follows="left|top|right" + layout="topleft" + left="10" + label="Filter Outfits" + max_length="300" + name="Filter" + search_button_visible="true" + top_pad="10" + width="303" /> + <panel + class="panel_outfits_inventory" + filename="panel_outfits_inventory.xml" + name="panel_outfits_inventory" + height="493" + min_height="410" + width="320" + visible="false" + left="0" + tab_group="1" + top_pad="6" + follows="all" /> + <!-- <button + follows="bottom|left" + height="23" + label="New outfit" + layout="topleft" + left_pad="5" + right="-10" + name="newlook_btn" + width="100" />--> + <panel + class="panel_outfit_edit" + filename="panel_outfit_edit.xml" + height="565" + follows="all" + layout="topleft" + left="5" + min_height="410" + name="panel_outfit_edit" + top="2" + visible="false" + width="320"/> + <panel + class="panel_edit_wearable" + filename="panel_edit_wearable.xml" + follows="all" + layout="topleft" + left="0" + name="panel_edit_wearable" + top="0" + visible="false" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml new file mode 100644 index 0000000000..f3c6895cee --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + follows="all" + height="570" + label="Things" + layout="topleft" + min_height="350" + min_width="240" + name="objects panel" + width="333"> + <panel + follows="all" + layout="topleft" + left="0" + name="sidepanel__inventory_panel" + top="0" + label="" + height="570" + visible="true" + width="330"> + <panel + class="panel_main_inventory" + filename="panel_main_inventory.xml" + follows="all" + layout="topleft" + left="0" + name="panel_main_inventory" + top="0" + label="" + height="545" + width="330" /> + <panel + follows="bottom|left|right" + height="25" + layout="topleft" + name="button_panel" + left="9" + top_pad="-2" + width="313"> + <layout_stack + follows="bottom|left|right" + height="23" + layout="topleft" + mouse_opaque="false" + name="button_panel_ls" + left="0" + orientation="horizontal" + top="0" + width="313"> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left="0" + mouse_opaque="false" + name="info_btn_lp" + user_resize="false" + auto_resize="true" + width="103"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Profile" + layout="topleft" + left="1" + name="info_btn" + tool_tip="Show object profile" + top="0" + width="102" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="share_btn_lp" + user_resize="false" + auto_resize="true" + width="102"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Share" + layout="topleft" + left="0" + name="share_btn" + tool_tip="Share an inventory item" + top="0" + width="102" /> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="shop_btn_lp" + user_resize="false" + auto_resize="true" + width="102"> + <button + enabled="true" + follows="bottom|left|right" + height="23" + label="Shop" + layout="topleft" + left="0" + name="shop_btn" + tool_tip="Open Marketplace webpage" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Wear" + layout="topleft" + left="0" + name="wear_btn" + tool_tip="Wear seleceted outfit" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Play" + layout="topleft" + name="play_btn" + left="0" + top="0" + width="102" /> + <button + enabled="false" + follows="bottom|left|right" + height="23" + label="Teleport" + layout="topleft" + left="0" + name="teleport_btn" + tool_tip="Teleport to the selected area" + top="0" + width="102" /> + </layout_panel> + </layout_stack> + </panel> + </panel> + +<panel + follows="all" + layout="topleft" + left="0" + class="sidepanel_item_info" + filename="sidepanel_item_info.xml" + name="sidepanel__item_panel" + top="0" + label="" + height="570" + visible="false" + width="330"> + </panel> + +<panel + follows="all" + layout="topleft" + left="0" + class="sidepanel_task_info" + filename="sidepanel_task_info.xml" + name="sidepanel__task_panel" + top="0" + label="" + height="570" + visible="false" + width="330"> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml new file mode 100644 index 0000000000..182bc29e27 --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -0,0 +1,433 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="all" + height="570" + layout="topleft" + name="item properties" + help_topic="item_properties" + title="Item Profile" + width="333"> + <panel.string + name="unknown"> + (unknown) + </panel.string> + <panel.string + name="public"> + (public) + </panel.string> + <panel.string + name="you_can"> + You can: + </panel.string> + <panel.string + name="owner_can"> + Owner can: + </panel.string> + <panel.string + name="acquiredDate"> + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + </panel.string> + <panel.string + name="origin_inventory"> + (Inventory) + </panel.string> + <panel.string + name="origin_inworld"> + (Inworld) + </panel.string> + <icon + follows="top|right" + height="18" + image_name="Lock" + layout="topleft" + right="-15" + mouse_opaque="true" + name="IconLocked" + top="8" + width="18" /> + <button + follows="top|left" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + left="12" + name="back_btn" + tab_stop="false" + top="2" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHugeBold" + height="26" + layout="topleft" + left_pad="3" + name="title" + text_color="LtGray" + top="2" + use_ellipses="true" + value="Item Profile" + width="275" /> + <text + follows="top|left|right" + height="13" + layout="topleft" + left="45" + name="origin" + text_color="LtGray_50" + use_ellipses="true" + value="(Inventory)" + width="275" /> + <scroll_container + color="DkGray2" + follows="all" + layout="topleft" + left="9" + name="item_profile_scroll" + opaque="true" + height="493" + width="313" + top="45"> + <panel + follows="left|top|right" + height="390" + help_topic="" + label="" + layout="topleft" + left="0" + name="item_profile" + top="0" + width="295"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemNameTitle" + top="10" + width="78"> + Name: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="20" + layout="topleft" + left_delta="78" + max_length="63" + name="LabelItemName" + top_delta="0" + width="210" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="LabelItemDescTitle" + top_pad="10" + width="78"> + Description: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="23" + layout="topleft" + left_delta="78" + max_length="127" + name="LabelItemDesc" + top_delta="-5" + width="210" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelCreatorTitle" + top_pad="10" + width="78"> + Creator: + </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="LabelCreatorName" + top_delta="6" + width="140"> + </text> + <button + follows="top|right" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" + layout="topleft" + right="-5" + name="BtnCreator" + top_delta="-6" + width="16" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelOwnerTitle" + top_pad="10" + width="78"> + Owner: + </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="LabelOwnerName" + top_delta="6" + width="140"> + </text> + <button + follows="top|right" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" + layout="topleft" + right="-5" + name="BtnOwner" + top_delta="-3" + width="16" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelAcquiredTitle" + top_pad="10" + width="78"> + Acquired: + </text> + <text + type="string" + length="1" + follows="left|top|right" + height="23" + layout="topleft" + left_delta="78" + name="LabelAcquiredDate" + top_delta="0" + width="210"> + </text> + <panel + border="false" + follows="left|top|right" + layout="topleft" + mouse_opaque="false" + name="perms_inv" + left="0" + top_pad="25" + height="155" + width="313"> + <text + type="string" + length="1" + left="10" + top_pad="13" + text_color="EmphasisColor" + height="15" + follows="left|top|right" + layout="topleft" + name="perm_modify" + width="200"> + You can: + </text> + <check_box + height="18" + label="Modify" + layout="topleft" + left="20" + name="CheckOwnerModify" + top_pad="0" + width="90" /> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckOwnerCopy" + width="90" /> + <check_box + height="18" + label="Transfer" + layout="topleft" + left_pad="0" + name="CheckOwnerTransfer" + width="106" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="AnyoneLabel" + top_pad="8" + width="100"> + Anyone: + </text> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckEveryoneCopy" + top_delta="-2" + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="8" + width="100"> + Group: + </text> + <check_box + height="18" + label="Share" + layout="topleft" + left_pad="0" + top_delta="-2" + name="CheckShareWithGroup" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="NextOwnerLabel" + top_pad="8" + width="200" + word_wrap="true"> + Next owner: + </text> + <check_box + height="18" + label="Modify" + layout="topleft" + left="20" + top_pad="0" + name="CheckNextOwnerModify" + width="90" /> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="CheckNextOwnerCopy" + width="90" /> + <check_box + height="18" + label="Transfer" + layout="topleft" + left_pad="0" + name="CheckNextOwnerTransfer" + tool_tip="Next owner can give away or resell this object" + width="106" /> + </panel> + <check_box + height="18" + label="For Sale" + layout="topleft" + left="20" + name="CheckPurchase" + top_pad="20" + width="100" /> + <combo_box + height="23" + left_pad="0" + layout="topleft" + follows="left|top" + name="combobox sale copy" + width="170"> + <combo_box.item + label="Copy" + name="Copy" + value="Copy" /> + <combo_box.item + label="Original" + name="Original" + value="Original" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="75" + left="120" + width="170" + min_val="0" + height="23" + max_val="999999999" + top_pad="10"/> + </panel> + </scroll_container> + <panel + height="30" + layout="topleft" + name="button_panel" + left="5" + top_pad="0" + width="313"> + <button + height="23" + label="Cancel" + layout="topleft" + name="cancel_btn" + right="-1" + width="100" /> + </panel> + </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 new file mode 100644 index 0000000000..843015cb8b --- /dev/null +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -0,0 +1,564 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + height="570" + layout="topleft" + name="object properties" + help_topic="object_properties" + title="Object Profile" + width="333"> + <panel.string + name="text deed continued"> + Deed + </panel.string> + <panel.string + name="text deed"> + Deed + </panel.string> + <panel.string + name="text modify info 1"> + You can modify this object + </panel.string> + <panel.string + name="text modify info 2"> + You can modify these objects + </panel.string> + <panel.string + name="text modify info 3"> + You can't modify this object + </panel.string> + <panel.string + name="text modify info 4"> + You can't modify these objects + </panel.string> + <panel.string + name="text modify warning"> + This object has linked parts + </panel.string> + <panel.string + name="Cost Default"> + Price: L$ + </panel.string> + <panel.string + name="Cost Total"> + Total Price: L$ + </panel.string> + <panel.string + name="Cost Per Unit"> + Price Per: L$ + </panel.string> + <panel.string + name="Cost Mixed"> + Mixed Price + </panel.string> + <panel.string + name="Sale Mixed"> + Mixed Sale + </panel.string> + <button + follows="top|right" + height="24" + image_hover_unselected="BackButton_Over" + image_pressed="BackButton_Press" + image_unselected="BackButton_Off" + layout="topleft" + left="8" + name="back_btn" + tab_stop="false" + top="0" + width="30" /> + <text + follows="top|left|right" + font="SansSerifHuge" + height="26" + layout="topleft" + left_pad="10" + name="title" + text_color="LtGray" + top="0" + use_ellipses="true" + value="Object Profile" + width="290" /> + <text + follows="top|left" + height="13" + layout="topleft" + left="45" + name="where" + text_color="LtGray_50" + value="(Inworld)" + width="150" /> + <panel + follows="all" + height="490" + label="" + layout="topleft" + left="10" + help_topic="" + name="properties_panel" + top="45" + width="313" + background_visible="true" + bg_alpha_color="DkGray2"> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="Name:" + top="10" + width="78"> + Name: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="20" + layout="topleft" + left_delta="78" + max_length="63" + name="Object Name" + top_delta="0" + width="225" /> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left="5" + name="Description:" + top_pad="10" + width="78"> + Description: + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + height="23" + layout="topleft" + name="Object Description" + select_on_focus="true" + left_delta="78" + max_length="127" + top_delta="-5" + width="225"/> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="CreatorNameLabel" + top_pad="12" + width="78"> + Creator: + </text> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="0" + name="Creator Name" + top_delta="0" + width="140"> + Erica Linden + </text> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="Owner:" + top_pad="15" + width="78"> + Owner: + </text> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="0" + name="Owner Name" + top_delta="0" + width="140"> + Erica Linden + </text> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="Group_label" + top_pad="15" + width="78"> + Group: + </text> + <button + follows="top|left" + height="10" + image_disabled="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + image_color="White_50" + layout="topleft" + left_pad="0" + top_delta="0" + name="button set group" + tab_stop="false" + tool_tip="Choose a group to share this object's permissions" + width="10" /> + <name_box + follows="left|top" + height="18" + initial_value="Loading..." + layout="topleft" + left_pad="5" + top_delta="-1" + name="Group Name Proxy" + width="150" /> + <button + follows="top|left" + height="23" + label="Deed" + label_selected="Deed" + layout="topleft" + name="button deed" + top_pad="0" + left="81" + tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." + width="100" /> + <text + type="string" + length="1" + follows="left|top" + height="9" + layout="topleft" + top_pad="5" + left="5" + name="label click action" + width="280"> + Click to: + </text> + <combo_box + follows="left|top" + height="23" + layout="topleft" + name="clickaction" + width="168" + left="81"> + <combo_box.item + label="Touch (default)" + name="Touch/grab(default)" + value="Touch/grab (default)" /> + <combo_box.item + label="Sit on object" + name="Sitonobject" + value="Sit on object" /> + <combo_box.item + label="Buy object" + name="Buyobject" + value="Buy object" /> + <combo_box.item + label="Pay object" + name="Payobject" + value="Pay object" /> + <combo_box.item + label="Open" + name="Open" + value="Open" /> + </combo_box> + <panel + border="false" + follows="left|top" + layout="topleft" + mouse_opaque="false" + background_visible="true" + bg_alpha_color="DkGray" + name="perms_inv" + left="0" + top_pad="15" + height="135" + width="313"> + <text + type="string" + length="1" + left="10" + top_pad="15" + text_color="EmphasisColor" + height="15" + follows="left|top|right" + layout="topleft" + name="perm_modify" + width="310"> + You can modify this object + </text> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="Anyone can:" + top_pad="8" + width="100"> + Anyone: + </text> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="checkbox allow everyone copy" + top_delta="-2" + width="90" /> + <check_box + height="18" + label="Move" + layout="topleft" + name="checkbox allow everyone move" + left_pad="0" + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="GroupLabel" + top_pad="8" + width="100"> + Group: + </text> + <check_box + height="18" + label="Share" + layout="topleft" + left_pad="90" + top_delta="-2" + name="checkbox share with group" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + width="150" /> + <text + type="string" + length="1" + follows="left|top" + height="16" + layout="topleft" + left="10" + name="NextOwnerLabel" + top_pad="8" + width="200" + word_wrap="true"> + Next owner: + </text> + <check_box + height="18" + label="Modify" + layout="topleft" + left="20" + top_pad="0" + name="checkbox next owner can modify" + width="90" /> + <check_box + height="18" + label="Copy" + layout="topleft" + left_pad="0" + name="checkbox next owner can copy" + width="90" /> + <check_box + height="18" + label="Transfer" + layout="topleft" + left_pad="0" + name="checkbox next owner can transfer" + tool_tip="Next owner can give away or resell this object" + width="106" /> + </panel> + <check_box + height="23" + label="For Sale" + layout="topleft" + left="20" + name="checkbox for sale" + top_pad="10" + width="100" /> + <combo_box + height="23" + left_pad="0" + layout="topleft" + follows="left|top" + name="sale type" + width="170"> + <combo_box.item + name="Copy" + label="Copy" + value="2" /> + <combo_box.item + name="Contents" + label="Contents" + value="3" /> + <combo_box.item + name="Original" + label="Original" + value="1" /> + </combo_box> + <spinner + follows="left|top" + decimal_digits="0" + increment="1" + top_pad="10" + left="120" + control_name="Edit Cost" + name="Edit Cost" + label="Price: L$" + label_width="65" + width="150" + min_val="1" + height="20" + max_val="999999999" /> + <check_box + height="20" + width="110" + top_pad="6" + label="Show in search" + layout="topleft" + left="120" + name="search_check" + tool_tip="Let people see this object in search results" /> + <text + type="string" + text_color="EmphasisColor" + length="1" + top_pad="15" + follows="left|top" + layout="topleft" + left="10" + name="B:" + height="10" + width="50"> + B: + </text> + <text + type="string" + text_color="White" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="O:" + height="10" + width="50"> + O: + </text> + <text + type="string" + text_color="EmphasisColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="G:" + height="10" + width="50"> + G: + </text> + <text + type="string" + text_color="White" + length="1" + follows="left|top" + left_pad="0" + layout="topleft" + name="E:" + height="10" + width="50"> + E: + </text> + <text + type="string" + text_color="EmphasisColor" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="N:" + height="10" + width="50"> + N: + </text> + <text + type="string" + text_color="White" + length="1" + follows="left|top" + layout="topleft" + left_pad="0" + name="F:" + height="10" + width="50"> + F: + </text> + </panel> + <panel + height="25" + layout="bottomright" + name="button_panel" + left="5" + bottom="5" + width="313"> + <button + follows="bottom|left" + height="23" + label="Open" + layout="topleft" + left="5" + name="open_btn" + top="0" + width="100" /> + <button + follows="bottom|left" + height="23" + label="Pay" + layout="topleft" + left_pad="5" + name="pay_btn" + top="0" + width="100" /> + <button + follows="bottom|left" + height="23" + label="Buy" + layout="topleft" + left_pad="5" + name="buy_btn" + top="0" + width="100" /> + <button + follows="bottom|left" + height="23" + label="Details" + layout="topleft" + left="5" + name="details_btn" + top="0" + width="100" + visible="false" /> + + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 58bb16581a..8470d91b8c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1,25 +1,33 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- This file contains strings that used to be hardcoded in the source. It is only for those strings which do not belong in a floater. - For example, the strings used in avatar chat bubbles, and strings + For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> <strings> <!-- Default Args - these arguments will be replaced in all strings --> <string name="SECOND_LIFE">Second Life</string> - <string name="SECOND_LIFE_VIEWER">Second Life</string> - <string name="SECOND_LIFE_GRID">Second Life</string> - <string name="SECOND_LIFE_SUPPORT">Second Life Support Portal</string> + <string name="APP_NAME">Second Life</string> + <string name="CAPITALIZED_APP_NAME">SECOND LIFE</string> + <string name="SECOND_LIFE_GRID">Second Life Grid</string> + <string name="SUPPORT_SITE">Second Life Support Portal</string> <!-- starting up --> <string name="StartupDetectingHardware">Detecting hardware...</string> - <string name="StartupLoading">Loading</string> - <string name="Fullbright">Fullbright (Legacy)</string> - <string name="CacheWaiting">(Loading...)</string> - <string name="CacheNobody">(nobody)</string> - <string name="CacheNone">(none)</string> + <string name="StartupLoading">Loading [APP_NAME]...</string> + <string name="StartupClearingCache">Clearing cache...</string> + <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingVFS">Initializing VFS...</string> + + <!-- progress --> + <string name="ProgressRestoring">Restoring...</string> + <string name="ProgressChangingResolution">Changing Resolution...</string> + + <!-- Legacy strings, almost never used --> + <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> + <!-- Login --> - <string name="LoginInProgress">Logging in. [SECOND_LIFE_VIEWER] may appear frozen. Please wait.</string> + <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> <string name="LoginInProgressNoFrozen">Logging in...</string> <string name="LoginAuthenticating">Authenticating</string> <string name="LoginMaintenance">Performing account maintenance...</string> @@ -38,31 +46,34 @@ <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> + <string name="InvalidCertificate">The server returned an invalid or corrupt certificate. Please contact the Grid administrator.</string> + <string name="CertInvalidHostname">An invalid hostname was used to access the server, please check your SLURL or Grid hostname.</string> + <string name="CertExpired">The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator.</string> + <string name="CertKeyUsage">The certificate returned by the server could not be used for SSL. Please contact your Grid administrator.</string> + <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> + <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string> + <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> - <string name="create_account_url">http://secondlife.com/registration/</string> + <string name="create_account_url">http://join.secondlife.com/</string> <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> - - - <!-- Tooltip, llhoverview.cpp --> + <string name="SavingSettings">Saving your settings...</string> + <string name="LoggingOut">Logging out...</string> + <string name="ShuttingDown">Shutting down...</string> + <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string> + <string name="SentToInvalidRegion">You were sent to an invalid region.</string> + <string name="TestingDisconnect">Testing viewer disconnect</string> + + <!-- Tooltip --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> <string name="TooltipPublic">Public</string> <!-- Public permissions on an object --> <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group --> - <string name="TooltipFlagScript">Script</string> - <string name="TooltipFlagPhysics">Physics</string> - <string name="TooltipFlagTouch">Touch</string> - <string name="TooltipFlagL$">L$</string> - <string name="TooltipFlagDropInventory">Drop Inventory</string> - <string name="TooltipFlagPhantom">Phantom</string> - <string name="TooltipFlagTemporary">Temporary</string> - <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string> - <string name="TooltipFreeToCopy">Free to copy</string> <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version --> - <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) --> <string name="TooltipFlagGroupBuild">Group Build</string> <string name="TooltipFlagNoBuild">No Build</string> <string name="TooltipFlagNoEdit">Group Build</string> @@ -71,17 +82,50 @@ <string name="TooltipFlagGroupScripts">Group Scripts</string> <string name="TooltipFlagNoScripts">No Scripts</string> <string name="TooltipLand">Land:</string> - <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> - <string name="TooltipAltLeft">Alt-Left arrow for previous tab</string> - <string name="TooltipAltRight">Alt-Right arrow for next tab</string> - + <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> + <string name="TooltipPrice" value="L$[AMOUNT]: "/> + + <!-- 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="TooltipAgentMute">Click to mute this Resident</string> + <string name="TooltipAgentUnmute">Click to unmute this Resident</string> + <string name="TooltipAgentIM">Click to IM this Resident</string> + <string name="TooltipAgentPay">Click to Pay this Resident</string> + <string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string> + <string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</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> + <string name="TooltipParcelUrl">Click to view this parcel's description</string> + <string name="TooltipTeleportUrl">Click to teleport to this location</string> + <string name="TooltipObjectIMUrl">Click to view this object's description</string> + <string name="TooltipMapUrl">Click to view this location on a map</string> + <string name="TooltipSLAPP">Click to run the secondlife:// command</string> + <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" /> + + <!-- text for SLURL labels --> + <string name="SLurlLabelTeleport">Teleport to</string> + <string name="SLurlLabelShowOnMap">Show Map for</string> + + <!-- label strings for secondlife:///app/agent SLapps --> + <string name="SLappAgentMute">Mute</string> + <string name="SLappAgentUnmute">Unmute</string> + <string name="SLappAgentIM">IM</string> + <string name="SLappAgentPay">Pay</string> + <string name="SLappAgentOfferTeleport">Offer Teleport to </string> + <string name="SLappAgentRequestFriend">Friend Request </string> + <!-- ButtonToolTips, llfloater.cpp --> - <string name="BUTTON_CLOSE_DARWIN">Close (Cmd-W)</string> - <string name="BUTTON_CLOSE_WIN">Close (Ctrl-W)</string> - <string name="BUTTON_RESTORE">Restore</string> + <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> + <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> + <string name="BUTTON_CLOSE_CHROME">Close</string> + <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> - <string name="BUTTON_EDIT">Edit</string> + <string name="BUTTON_DOCK">Dock</string> + <string name="BUTTON_HELP">Show Help</string> <!-- searching - generic --> <string name="Searching">Searching...</string> @@ -91,25 +135,28 @@ <string name="RetrievingData">Retrieving...</string> <string name="ReleaseNotes">Release Notes</string> - <string name="RELEASE_NOTES_BASE_URL">http://secondlife.com/app/releasenotes/</string> + <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. --> + <string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.secondlife.com/wiki/Release_Notes/</string> <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <string name="LoadingData">Loading...</string> - - + + <!-- namecache --> <!-- Avatar name: text shown for LLUUID::null --> <string name="AvatarNameNobody">(nobody)</string> - + <!-- Avatar name: text shown while fetching name --> <string name="AvatarNameWaiting">(waiting)</string> - <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> - <string name="AvatarNameHippos">(hippos)</string> - + <!-- Avatar name: More than one avatar is selected/used here --> + <string name="AvatarNameMultiple">(multiple)</string> + <!-- Group name: text shown for LLUUID::null --> <string name="GroupNameNone">(none)</string> - + + <string name="AvalineCaller">Avaline Caller [ORDER]</string> + <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> <string name="AssetErrorNone">No error</string> <string name="AssetErrorRequestFailed">Asset request: failed</string> @@ -122,8 +169,9 @@ <string name="AssetErrorCircuitGone">Circuit gone</string> <string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string> <string name="AssetErrorUnknownStatus">Unknown status</string> - - <!-- Asset Type Human Names --> + + <!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* --> + <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem --> <string name="texture">texture</string> <string name="sound">sound</string> <string name="calling card">calling card</string> @@ -131,28 +179,30 @@ <string name="legacy script">legacy script</string> <string name="clothing">clothing</string> <string name="object">object</string> - <string name="note card">note card</string> + <string name="note card">notecard</string> <string name="folder">folder</string> <string name="root">root</string> - <string name="lsl2 script">lsl2 script</string> - <string name="lsl bytecode">lsl bytecode</string> + <string name="lsl2 script">LSL2 script</string> + <string name="lsl bytecode">LSL bytecode</string> <string name="tga texture">tga texture</string> - <string name="body part">body part</string> - <string name="snapshot">snapshot</string> - <string name="lost and found">lost and found</string> - <string name="targa image">targa image</string> - <string name="trash">trash</string> - <string name="jpeg image">jpeg image</string> - <string name="animation">animation</string> - <string name="gesture">gesture</string> - <string name="simstate">simstate</string> - <string name="favorite">favorite</string> - + <string name="body part">body part</string> + <string name="snapshot">snapshot</string> + <string name="lost and found">Lost and Found</string> + <string name="targa image">targa image</string> + <string name="trash">Trash</string> + <string name="jpeg image">jpeg image</string> + <string name="animation">animation</string> + <string name="gesture">gesture</string> + <string name="simstate">simstate</string> + <string name="favorite">favorite</string> + <string name="symbolic link">link</string> + <string name="symbolic folder link">folder link</string> + <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarAway">Away</string> <string name="AvatarBusy">Busy</string> - <string name="AvatarMuted">Muted</string> + <string name="AvatarMuted">Blocked</string> <!-- animations --> <string name="anim_express_afraid">Afraid</string> @@ -224,15 +274,18 @@ <string name="anim_express_worry">Worry</string> <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> - + + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> - + <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string> + <string name="worldmap_results_none_found">None found.</string> + <!-- animations uploading status codes --> <string name="Ok">OK</string> <string name="Premature end of file">Premature end of file</string> <string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string> - + <!-- Chat --> <string name="whisper">whispers:</string> <string name="shout">shouts:</string> @@ -240,6 +293,7 @@ <string name="connected">Connected</string> <string name="unavailable">Voice not available at your current location</string> <string name="hang_up">Disconnected from in-world Voice Chat</string> + <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string> <string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string> <string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string> <string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string> @@ -253,20 +307,24 @@ <string name="ChangePermissions">Change its permissions</string> <string name="TrackYourCamera">Track your camera</string> <string name="ControlYourCamera">Control your camera</string> + <string name="NotConnected">Not Connected</string> - <!-- IM --> - <string name="IM_logging_string">-- Instant message logging enabled --</string> - <!-- Sim Access labels --> - <string name="SIM_ACCESS_PG">PG</string> - <string name="SIM_ACCESS_MATURE">Mature</string> + <string name="SIM_ACCESS_PG">General</string> + <string name="SIM_ACCESS_MATURE">Moderate</string> <string name="SIM_ACCESS_ADULT">Adult</string> <string name="SIM_ACCESS_DOWN">Offline</string> <string name="SIM_ACCESS_MIN">Unknown</string> - + <!-- For use when we do not have land type back from the server --> <string name="land_type_unknown">(unknown)</string> + <!-- For land type back from the simulator --> + <string name="Estate / Full Region">Estate / Full Region</string> + <string name="Estate / Homestead">Estate / Homestead</string> + <string name="Mainland / Homestead">Mainland / Homestead</string> + <string name="Mainland / Full Region">Mainland / Full Region</string> + <!-- File load/save dialogs --> <string name="all_files">All Files</string> <string name="sound_files">Sounds</string> @@ -284,12 +342,1463 @@ <string name="load_files">Load Files</string> <string name="choose_the_directory">Choose Directory</string> - <!-- Avatar busy/away mode --> - <string name="AvatarSetNotAway">Set Not Away</string> - <string name="AvatarSetAway">Set Away</string> - <string name="AvatarSetNotBusy">Set Not Busy</string> - <string name="AvatarSetBusy">Set Busy</string> - + <!-- LSL Usage Hover Tips --> + <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window). + This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings. --> + <string name="LSLTipSleepTime" translate="false"> +Sleeps script for [SLEEP_TIME] seconds. + </string> + + <string name="LSLTipText_llSin" translate="false"> +float llSin(float theta) +Returns the sine of theta (theta in radians) + </string> + <string name="LSLTipText_llCos" translate="false"> +float llCos(float theta) +Returns the cosine of theta (theta in radians) + </string> + <string name="LSLTipText_llTan" translate="false"> +float llTan(float theta) +Returns the tangent of theta (theta in radians) + </string> + <string name="LSLTipText_llAtan2" translate="false"> +float llAtan2(float y, float x) +Returns the arctangent2 of y, x + </string> + <string name="LSLTipText_llSqrt" translate="false"> +float llSqrt(float val) +Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results + </string> + <string name="LSLTipText_llPow" translate="false"> +float llPow(float base, float exponent) +Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results + </string> + <string name="LSLTipText_llAbs" translate="false"> +integer llAbs(integer val) +Returns the positive version of val + </string> + <string name="LSLTipText_llFabs" translate="false"> +float llFabs(float val) +Returns the positive version of val + </string> + <string name="LSLTipText_llFrand" translate="false"> +float llFrand(float mag) +Returns a pseudo random number in the range [0,mag) or (mag,0] + </string> + <string name="LSLTipText_llFloor" translate="false"> +integer llFloor(float val) +Returns largest integer value <= val + </string> + <string name="LSLTipText_llCeil" translate="false"> +integer llCeil(float val) +Returns smallest integer value >= val + </string> + <string name="LSLTipText_llRound" translate="false"> +integer llRound(float val) +Returns val rounded to the nearest integer + </string> + <string name="LSLTipText_llVecMag" translate="false"> +float llVecMag(vector v) +Returns the magnitude of v + </string> + <string name="LSLTipText_llVecNorm" translate="false"> +vector llVecNorm(vector v) +Returns the v normalized + </string> + <string name="LSLTipText_llVecDist" translate="false"> +float llVecDist(vector v1, vector v2) +Returns the 3D distance between v1 and v2 + </string> + <string name="LSLTipText_llRot2Euler" translate="false"> +vector llRot2Euler(rotation q) +Returns the Euler representation (roll, pitch, yaw) of q + </string> + <string name="LSLTipText_llEuler2Rot" translate="false"> +rotation llEuler2Rot(vector v) +Returns the rotation representation of Euler Angles v + </string> + <string name="LSLTipText_llAxes2Rot" translate="false"> +rotation llAxes2Rot(vector fwd, vector left, vector up) +Returns the rotation defined by the coordinate axes + </string> + <string name="LSLTipText_llRot2Fwd" translate="false"> +vector llRot2Fwd(rotation q) +Returns the forward vector defined by q + </string> + <string name="LSLTipText_llRot2Left" translate="false"> +vector llRot2Left(rotation q) +Returns the left vector defined by q + </string> + <string name="LSLTipText_llRot2Up" translate="false"> +vector llRot2Up(rotation q) +Returns the up vector defined by q + </string> + <string name="LSLTipText_llRotBetween" translate="false"> +rotation llRotBetween(vector v1, vector v2) +Returns the rotation to rotate v1 to v2 + </string> + <string name="LSLTipText_llWhisper" translate="false"> +llWhisper(integer channel, string msg) +Whispers the text of msg on channel + </string> + <string name="LSLTipText_llSay" translate="false"> +llSay(integer channel, string msg) +Says the text of msg on channel + </string> + <string name="LSLTipText_llShout" translate="false"> +llShout(integer channel, string msg) +Shouts the text of msg on channel + </string> + <string name="LSLTipText_llListen" translate="false"> +integer llListen(integer channel, string name, key id, string msg) +Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen + </string> + <string name="LSLTipText_llListenControl" translate="false"> +llListenControl(integer number, integer active) +Makes a listen event callback active or inactive + </string> + <string name="LSLTipText_llListenRemove" translate="false"> +llListenRemove(integer number) +Removes listen event callback number + </string> + <string name="LSLTipText_llSensor" translate="false"> +llSensor(string name, key id, integer type, float range, float arc) +Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) + </string> + <string name="LSLTipText_llSensorRepeat" translate="false"> +llSensorRepeat(string name, key id, integer type, float range, float arc, float rate) +Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds + </string> + <string name="LSLTipText_llSensorRemove" translate="false"> +llSensorRemove() +Removes the sensor setup by llSensorRepeat + </string> + <string name="LSLTipText_llDetectedName" translate="false"> +string llDetectedName(integer number) +Returns the name of detected object number (returns empty string if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedKey" translate="false"> +key llDetectedKey(integer number) +Returns the key of detected object number (returns empty key if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedOwner" translate="false"> +key llDetectedOwner(integer number) +Returns the key of detected object's owner (returns empty key if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedType" translate="false"> +integer llDetectedType(integer number) +Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedPos" translate="false"> +vector llDetectedPos(integer number) +Returns the position of detected object number (returns <0,0,0> if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedVel" translate="false"> +vector llDetectedVel(integer number) +Returns the velocity of detected object number (returns <0,0,0> if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedGrab" translate="false"> +vector llDetectedGrab(integer number) +Returns the grab offset of the user touching object (returns <0,0,0> if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedRot" translate="false"> +rotation llDetectedRot(integer number) +Returns the rotation of detected object number (returns <0,0,0,1> if number is not a valid sensed object) + </string> + <string name="LSLTipText_llDetectedGroup" translate="false"> +integer llDetectedGroup(integer number) +Returns TRUE if detected object is part of same group as owner + </string> + <string name="LSLTipText_llDetectedLinkNumber" translate="false"> +integer llDetectedLinkNumber(integer number) +Returns the link position of the triggered event for touches and collisions only + </string> + <string name="LSLTipText_llDie" translate="false"> +llDie() +Deletes the object + </string> + <string name="LSLTipText_llGround" translate="false"> +float llGround(vector offset) +Returns the ground height below the object position + offset + </string> + <string name="LSLTipText_llCloud" translate="false"> +float llCloud(vector offset) +Returns the cloud density at the object position + offset + </string> + <string name="LSLTipText_llWind" translate="false"> +vector llWind(vector offset) +Returns the wind velocity at the object position + offset + </string> + <string name="LSLTipText_llSetStatus" translate="false"> +llSetStatus(integer status, integer value) +Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value + </string> + <string name="LSLTipText_llGetStatus" translate="false"> +integer llGetStatus(integer status) +Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) + </string> + <string name="LSLTipText_llSetScale" translate="false"> +llSetScale(vector scale) +Sets the scale of the prim + </string> + <string name="LSLTipText_llGetScale" translate="false"> +vector llGetScale() +Returns the scale of the prim + </string> + <string name="LSLTipText_llSetColor" translate="false"> +llSetColor(vector color, integer face) +Sets the color on face of the prim + </string> + <string name="LSLTipText_llGetAlpha" translate="false"> +float llGetAlpha(integer face) +Returns the alpha of face + </string> + <string name="LSLTipText_llSetAlpha" translate="false"> +llSetAlpha(float alpha, integer face) +Sets the alpha on face + </string> + <string name="LSLTipText_llGetColor" translate="false"> +vector llGetColor(integer face) +Returns the color on face + </string> + <string name="LSLTipText_llSetTexture" translate="false"> +llSetTexture(string texture, integer face) +Sets the texture of face or ALL_SIDES + </string> + <string name="LSLTipText_llScaleTexture" translate="false"> +llScaleTexture(float u, float v, integer face) +Sets the texture u & v scales for the chosen face or ALL_SIDES + </string> + <string name="LSLTipText_llOffsetTexture" translate="false"> +llOffsetTexture(float u, float v, integer face) +Sets the texture u & v offsets for the chosen face or ALL_SIDES + </string> + <string name="LSLTipText_llRotateTexture" translate="false"> +llRotateTexture(float rotation, integer face) +Sets the texture rotation for the chosen face + </string> + <string name="LSLTipText_llGetTexture" translate="false"> +string llGetTexture(integer face) +Returns a string that is the texture on face (the inventory name if it is a texture in the prim's inventory, otherwise the key) + </string> + <string name="LSLTipText_llSetPos" translate="false"> +llSetPos(vector pos) +Moves the object or prim towards pos without using physics (if the script isn't physical) + </string> + <string name="LSLTipText_llGetPos" translate="false"> +vector llGetPos() +Returns the position of the task in region coordinates + </string> + <string name="LSLTipText_llGetLocalPos" translate="false"> +vector llGetLocalPos() +Returns the position relative to the root + </string> + <string name="LSLTipText_llSetRot" translate="false"> +llSetRot(rotation rot) +Sets the rotation + </string> + <string name="LSLTipText_llGetRot" translate="false"> +rotation llGetRot() +Returns the rotation relative to the region's axes + </string> + <string name="LSLTipText_llGetLocalRot" translate="false"> +rotation llGetLocalRot() +Returns the rotation local to the root + </string> + <string name="LSLTipText_llSetForce" translate="false"> +llSetForce(vector force, integer local) +Applies force to the object (if the script is physical), in local coords if local == TRUE + </string> + <string name="LSLTipText_llGetForce" translate="false"> +vector llGetForce() +Returns the force (if the script is physical) + </string> + <string name="LSLTipText_llTarget" translate="false"> +integer llTarget(vector position, float range) +Sets positions within range of position as a target and return an ID for the target + </string> + <string name="LSLTipText_llTargetRemove" translate="false"> +llTargetRemove(integer number) +Removes positional target number registered with llTarget + </string> + <string name="LSLTipText_llRotTarget" translate="false"> +integer llRotTarget(rotation rot, float error) +Set rotations with error of rot as a rotational target and return an ID for the rotational target + </string> + <string name="LSLTipText_llRotTargetRemove" translate="false"> +llRotTargetRemove(integer number) +Removes rotational target number registered with llRotTarget + </string> + <string name="LSLTipText_llMoveToTarget" translate="false"> +llMoveToTarget(vector target, float tau) +Critically damps to target in tau seconds (if the script is physical) + </string> + <string name="LSLTipText_llStopMoveToTarget" translate="false"> +llStopMoveToTarget() +Stops critically damped motion + </string> + <string name="LSLTipText_llApplyImpulse" translate="false"> +llApplyImpulse(vector force, integer local) +Applies impulse to object (if the script is physical), in local coords if local == TRUE + </string> + <string name="LSLTipText_llApplyRotationalImpulse" translate="false"> +llApplyRotationalImpulse(vector force, integer local) +Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE + </string> + <string name="LSLTipText_llSetTorque" translate="false"> +llSetTorque(vector torque, integer local) +Sets the torque of object (if the script is physical), in local coords if local == TRUE + </string> + <string name="LSLTipText_llGetTorque" translate="false"> +vector llGetTorque() +Returns the torque (if the script is physical) + </string> + <string name="LSLTipText_llSetForceAndTorque" translate="false"> +llSetForceAndTorque(vector force, vector torque, integer local) +Sets the force and torque of object (if the script is physical), in local coords if local == TRUE + </string> + <string name="LSLTipText_llGetVel" translate="false"> +vector llGetVel() +Returns the velocity of the object + </string> + <string name="LSLTipText_llGetAccel" translate="false"> +vector llGetAccel() +Returns the acceleration of the object relative to the region's axes + </string> + <string name="LSLTipText_llGetOmega" translate="false"> +vector llGetOmega() +Returns the rotation velocity in radians per second + </string> + <string name="LSLTipText_llGetTimeOfDay" translate="false"> +float llGetTimeOfDay() +Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller + </string> + <string name="LSLTipText_llGetWallclock" translate="false"> +float llGetWallclock() +Returns the time in seconds since midnight California Pacific time (PST/PDT) + </string> + <string name="LSLTipText_llGetTime" translate="false"> +float llGetTime() +Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime + </string> + <string name="LSLTipText_llResetTime" translate="false"> +llResetTime() +Sets the script timer to zero + </string> + <string name="LSLTipText_llGetAndResetTime" translate="false"> +float llGetAndResetTime() +Returns the script time in seconds and then resets the script timer to zero + </string> + <string name="LSLTipText_llSoplayund" translate="false"> +llSound(string sound, float volume, integer queue, integer loop) +Plays sound at volume and whether it should loop or not + </string> + <string name="LSLTipText_llPlaySound" translate="false"> +llPlaySound(string sound, float volume) +Plays attached sound once at volume (0.0 - 1.0) + </string> + <string name="LSLTipText_llLoopSound" translate="false"> +llLoopSound(string sound, float volume) +Plays attached sound looping indefinitely at volume (0.0 - 1.0) + </string> + <string name="LSLTipText_llLoopSoundMaster" translate="false"> +llLoopSoundMaster(string sound, float volume) +Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master + </string> + <string name="LSLTipText_llLoopSoundSlave" translate="false"> +llLoopSoundSlave(string sound, float volume) +Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master + </string> + <string name="LSLTipText_llPlaySoundSlave" translate="false"> +llPlaySoundSlave(string sound, float volume) +Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master + </string> + <string name="LSLTipText_llTriggerSound" translate="false"> +llTriggerSound(string sound, float volume) +Plays sound at volume (0.0 - 1.0), centered at but not attached to object + </string> + <string name="LSLTipText_llStopSound" translate="false"> +llStopSound() +Stops currently attached sound + </string> + <string name="LSLTipText_llPreloadSound" translate="false"> +llPreloadSound(string sound) +Preloads a sound on viewers within range + </string> + <string name="LSLTipText_llGetSubString" translate="false"> +string llGetSubString(string src, integer start, integer end) +Returns the indicated substring + </string> + <string name="LSLTipText_llDeleteSubString" translate="false"> +string llDeleteSubString(string src, integer start, integer end) +Removes the indicated substring and returns the result + </string> + <string name="LSLTipText_llInsertString" translate="false"> +string llInsertString(string dst, integer position, string src) +Returns a destination string dst with the string src inserted starting at position pos + </string> + <string name="LSLTipText_llToUpper" translate="false"> +string llToUpper(string src) +Returns a string that is src with all upper-case characters + </string> + <string name="LSLTipText_llToLower" translate="false"> +string llToLower(string src) +Returns a string that is src with all lower-case characters + </string> + <string name="LSLTipText_llGiveMoney" translate="false"> +llGiveMoney(key destination, integer amount) +Transfers amount of L$ from script owner to destination + </string> + <string name="LSLTipText_llMakeExplosion" translate="false"> +llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) +Makes a round explosion of particles + </string> + <string name="LSLTipText_llMakeFountain" translate="false"> +llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset) +Makes a fountain of particles + </string> + <string name="LSLTipText_llMakeSmoke" translate="false"> +llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) +Makes smoke like particles + </string> + <string name="LSLTipText_llMakeFire" translate="false"> +llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset) +Makes fire like particles + </string> + <string name="LSLTipText_llRezObject" translate="false"> +llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param) +Instantiates owner's inventory object at pos with velocity vel and rotation rot with start parameter param + </string> + <string name="LSLTipText_llLookAt" translate="false"> +llLookAt(vector target, float strength, float damping) +Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon + </string> + <string name="LSLTipText_llStopLookAt" translate="false"> +llStopLookAt() +Stops causing object to point at a target + </string> + <string name="LSLTipText_llSetTimerEvent" translate="false"> +llSetTimerEvent(float sec) +Causes the timer event to be triggered a maximum of once every sec seconds + </string> + <string name="LSLTipText_llSleep" translate="false"> +llSleep(float sec) +Puts the script to sleep for sec seconds + </string> + <string name="LSLTipText_llGetMass" translate="false"> +float llGetMass() +Returns the mass of object that the script is attached to + </string> + <string name="LSLTipText_llCollisionFilter" translate="false"> +llCollisionFilter(string name, key id, integer accept) +Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id + </string> + <string name="LSLTipText_llTakeControls" translate="false"> +llTakeControls(integer controls, integer accept, integer pass_on) +Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for + </string> + <string name="LSLTipText_llReleaseControls" translate="false"> +llReleaseControls() +Stops taking inputs that were taken with llTakeControls + </string> + <string name="LSLTipText_llAttachToAvatar" translate="false"> +llAttachToAvatar(integer attach_point) +Attaches the object to the avatar who has granted permission to the script + </string> + <string name="LSLTipText_llDetachFromAvatar" translate="false"> +llDetachFromAvatar() +Detaches object from avatar + </string> + <string name="LSLTipText_llTakeCamera" translate="false"> +llTakeCamera(key avatar) +Moves avatar's viewpoint to task + </string> + <string name="LSLTipText_llReleaseCamera" translate="false"> +llReleaseCamera(key avatar) +Returns camera to agent avatar + </string> + <string name="LSLTipText_llGetOwner" translate="false"> +key llGetOwner() +Returns the object owner's UUID + </string> + <string name="LSLTipText_llInstantMessage" translate="false"> +llInstantMessage(key user, string message) +Sends the specified string as an Instant Message to the user + </string> + <string name="LSLTipText_llEmail" translate="false"> +llEmail(string address, string subject, string message) +Sends an email to address with the subject and message + </string> + <string name="LSLTipText_llGetNextEmail" translate="false"> +llGetNextEmail(string address, string subject) +Gets the next waiting email that comes from address, with specified subject + </string> + <string name="LSLTipText_llGetKey" translate="false"> +key llGetKey() +Returns the key of the prim the script is attached to + </string> + <string name="LSLTipText_llSetBuoyancy" translate="false"> +llSetBuoyancy(float buoyancy) +Sets the buoyancy of the task or object (0 is disabled, < 1.0 sinks, 1.0 floats, > 1.0 rises) + </string> + <string name="LSLTipText_llSetHoverHeight" translate="false"> +llSetHoverHeight(float height, integer water, float tau) +Critically damps to a height above the ground (or water) in tau seconds + </string> + <string name="LSLTipText_llStopHover" translate="false"> +llStopHover() +Stops hovering to a height + </string> + <string name="LSLTipText_llMinEventDelay" translate="false"> +llMinEventDelay(float delay) +Sets the minimum time between events being handled + </string> + <string name="LSLTipText_llSoundPreload" translate="false"> +llSoundPreload(string sound) +Preloads a sound on viewers within range + </string> + <string name="LSLTipText_llRotLookAt" translate="false"> +llRotLookAt(rotation target, float strength, float damping) +Causes object to point its forward axis towards target + </string> + <string name="LSLTipText_llStringLength" translate="false"> +integer llStringLength(string str) +Returns the length of string + </string> + <string name="LSLTipText_llStartAnimation" translate="false"> +llStartAnimation(string anim) +Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked + </string> + <string name="LSLTipText_llStopAnimation" translate="false"> +llStopAnimation(string anim) +Stops animation anim for agent that granted permission + </string> + <string name="LSLTipText_llPointAt" translate="false"> +llPointAt(vector pos) +Makes agent that owns object point at pos + </string> + <string name="LSLTipText_llStopPointAt" translate="false"> +llStopPointAt() +Stops pointing agent that owns object + </string> + <string name="LSLTipText_llTargetOmega" translate="false"> +llTargetOmega(vector axis, float spinrate, float gain) +Rotates the object around axis at spinrate with strength gain + </string> + <string name="LSLTipText_llGetStartParameter" translate="false"> +integer llGetStartParameter() +Returns an integer that is the script start/rez parameter + </string> + <string name="LSLTipText_llGodLikeRezObject" translate="false"> +llGodLikeRezObject(key inventory, vector pos) +Rezzes directly off of UUID if owner is in God Mode + </string> + <string name="LSLTipText_llRequestPermissions" translate="false"> +llRequestPermissions(key agent, integer perm) +Asks the agent for permission to run certain classes of functions + </string> + <string name="LSLTipText_llGetPermissionsKey" translate="false"> +key llGetPermissionsKey() +Returns the key of the avatar that last granted permissions to the script + </string> + <string name="LSLTipText_llGetPermissions" translate="false"> +integer llGetPermissions() +Returns an integer bitfield with the permissions that have been granted + </string> + <string name="LSLTipText_llGetLinkNumber" translate="false"> +integer llGetLinkNumber() +Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc) + </string> + <string name="LSLTipText_llSetLinkColor" translate="false"> +llSetLinkColor(integer linknumber, vector color, integer face) +Sets face to color if a task exists in the link chain at linknumber + </string> + <string name="LSLTipText_llCreateLink" translate="false"> +llCreateLink(key target, integer parent) +Attempts to link the script's object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script's object becomes the root + </string> + <string name="LSLTipText_llBreakLink" translate="false"> +llBreakLink(integer linknum) +Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted) + </string> + <string name="LSLTipText_llBreakAllLinks" translate="false"> +llBreakAllLinks() +Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted) + </string> + <string name="LSLTipText_llGetLinkKey" translate="false"> +key llGetLinkKey(integer linknumber) +Returns the key of the linked prim linknumber + </string> + <string name="LSLTipText_llGetLinkName" translate="false"> +string llGetLinkName(integer linknumber) +Returns the name of linknumber in a link set + </string> + <string name="LSLTipText_llGetInventoryNumber" translate="false"> +integer llGetInventoryNumber(integer type) +Returns the number of items of a given type (INVENTORY_* flag) in the prim's inventory + </string> + <string name="LSLTipText_llGetInventoryName" translate="false"> +string llGetInventoryName(integer type, integer number) +Returns the name of the inventory item number of a given type + </string> + <string name="LSLTipText_llSetScriptState" translate="false"> +llSetScriptState(string name, integer run) +Sets the running state of the specified script + </string> + <string name="LSLTipText_llGetEnergy" translate="false"> +float llGetEnergy() +Returns how much energy is in the object as a percentage of maximum + </string> + <string name="LSLTipText_llGiveInventory" translate="false"> +llGiveInventory(key destination, string inventory) +Gives inventory to destination + </string> + <string name="LSLTipText_llRemoveInventory" translate="false"> +llRemoveInventory(string item) +Removes the named inventory item + </string> + <string name="LSLTipText_llSetText" translate="false"> +llSetText(string text, vector color, float alpha) +Displays text that hovers over the prim with specific color and translucency specified with alpha + </string> + <string name="LSLTipText_llWater" translate="false"> +float llWater(vector offset) +Returns the water height below the object position + offset + </string> + <string name="LSLTipText_llPassTouches" translate="false"> +llPassTouches(integer pass) +If pass == TRUE, touches are passed from children on to parents + </string> + <string name="LSLTipText_llRequestAgentData" translate="false"> +key llRequestAgentData(key id, integer data) +Requests data about agent id. When data is available the dataserver event will be raised. + </string> + <string name="LSLTipText_llRequestInventoryData" translate="false"> +key llRequestInventoryData(string name) +Requests data from object's inventory object. When data is available the dataserver event will be raised. + </string> + <string name="LSLTipText_llSetDamage" translate="false"> +llSetDamage(float damage) +Sets the amount of damage that will be done when this object hits an avatar. + </string> + <string name="LSLTipText_llTeleportAgentHome" translate="false"> +llTeleportAgentHome(key id) +Teleports avatar on the owner's land to their home location without any warning + </string> + <string name="LSLTipText_llModifyLand" translate="false"> +llModifyLand(integer action, integer brush) +Modifies land using the specified action on the specified brush size of land + </string> + <string name="LSLTipText_llCollisionSound" translate="false"> +llCollisionSound(string impact_sound, float impact_volume) +Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume + </string> + <string name="LSLTipText_llCollisionSprite" translate="false"> +llCollisionSprite(string impact_sprite) +Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress) + </string> + <string name="LSLTipText_llGetAnimation" translate="false"> +string llGetAnimation(key id) +Returns the name of the currently playing locomotion animation for avatar id + </string> + <string name="LSLTipText_llResetScript" translate="false"> +llResetScript() +Resets the script + </string> + <string name="LSLTipText_llMessageLinked" translate="false"> +llMessageLinked(integer linknum, integer num, string str, key id) +Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum. + </string> + <string name="LSLTipText_llPushObject" translate="false"> +llPushObject(key id, vector impulse, vector ang_impulse, integer local) +Applies impulse and ang_impulse to object id + </string> + <string name="LSLTipText_llPassCollisions" translate="false"> +llPassCollisions(integer pass) +If pass == TRUE, collisions are passed from children on to parents (default is FALSE) + </string> + <string name="LSLTipText_llGetScriptName" translate="false"> +string llGetScriptName() +Returns the name of the script that this function is used in + </string> + <string name="LSLTipText_llGetNumberOfSides" translate="false"> +integer llGetNumberOfSides() +Returns the number of faces (or sides) of the prim + </string> + <string name="LSLTipText_llAxisAngle2Rot" translate="false"> +rotation llAxisAngle2Rot(vector axis, float angle) +Returns the rotation that is a generated angle about axis + </string> + <string name="LSLTipText_llRot2Axis" translate="false"> +vector llRot2Axis(rotation rot) +Returns the rotation axis represented by rot + </string> + <string name="LSLTipText_llRot2Angle" translate="false"> +float llRot2Angle(rotation rot) +Returns the rotation angle represented by rot + </string> + <string name="LSLTipText_llAcos" translate="false"> +float llAcos(float val) +Returns the arccosine in radians of val + </string> + <string name="LSLTipText_llAsin" translate="false"> +float llAsin(float val) +Returns the arcsine in radians of val + </string> + <string name="LSLTipText_llAngleBetween" translate="false"> +float llAngleBetween(rotation a, rotation b) +Returns angle between rotation a and b + </string> + <string name="LSLTipText_llGetInventoryKey" translate="false"> +key llGetInventoryKey(string name) +Returns the key that is the UUID of the inventory name + </string> + <string name="LSLTipText_llAllowInventoryDrop" translate="false"> +llAllowInventoryDrop(integer add) +If add == TRUE, users without modify permissions can still drop inventory items onto a prim + </string> + <string name="LSLTipText_llGetSunDirection" translate="false"> +vector llGetSunDirection() +Returns a normalized vector of the direction of the sun in the region + </string> + <string name="LSLTipText_llGetTextureOffset" translate="false"> +vector llGetTextureOffset(integer face) +Returns the texture offset of face in the x and y components of a vector + </string> + <string name="LSLTipText_llGetTextureScale" translate="false"> +vector llGetTextureScale(integer side) +Returns the texture scale of side in the x and y components of a vector + </string> + <string name="LSLTipText_llGetTextureRot" translate="false"> +float llGetTextureRot(integer side) +Returns the texture rotation of side + </string> + <string name="LSLTipText_llSubStringIndex" translate="false"> +integer llSubStringIndex(string source, string pattern) +Returns an integer that is the index in source where pattern first appears. +(Returns -1 if not found) + </string> + <string name="LSLTipText_llGetOwnerKey" translate="false"> +key llGetOwnerKey(key id) +Returns the owner of object id + </string> + <string name="LSLTipText_llGetCenterOfMass" translate="false"> +vector llGetCenterOfMass() +Returns the prim's center of mass (unless called from the root prim, where it returns the object's center of mass) + </string> + <string name="LSLTipText_llListSort" translate="false"> +list llListSort(list src, integer stride, integer ascending) +Sorts the list into blocks of stride, in ascending order if ascending == TRUE. +The sort order is affected by type. + </string> + <string name="LSLTipText_llGetListLength" translate="false"> +integer llGetListLength(list src) +Returns the number of elements in the list + </string> + <string name="LSLTipText_llList2Integer" translate="false"> +integer llList2Integer(list src, integer index) +Copies the integer at index in the list + </string> + <string name="LSLTipText_llList2Float" translate="false"> +float llList2Float(list src, integer index) +Copies the float at index in the list + </string> + <string name="LSLTipText_llList2String" translate="false"> +string llList2String(list src, integer index) +Copies the string at index in the list + </string> + <string name="LSLTipText_llList2Key" translate="false"> +key llList2Key(list src, integer index) +Copies the key at index in the list + </string> + <string name="LSLTipText_llList2Vector" translate="false"> +vector llList2Vector(list src, integer index) +Copies the vector at index in the list + </string> + <string name="LSLTipText_llList2Rot" translate="false"> +rotation llList2Rot(list src, integer index) +Copies the rotation at index in the list + </string> + <string name="LSLTipText_llList2List" translate="false"> +list llList2List(list src, integer start, integer end) +Copies the slice of the list from start to end + </string> + <string name="LSLTipText_llDeleteSubList" translate="false"> +list llDeleteSubList(list src, integer start, integer end) +Removes the slice from start to end and returns the remainder of the list + </string> + <string name="LSLTipText_llGetListEntryType" translate="false"> +integer llGetListEntryType(list src, integer index) +Returns the type of the index entry in the list +(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list) + </string> + <string name="LSLTipText_llList2CSV" translate="false"> +string llList2CSV(list src) +Creates a string of comma separated values from list + </string> + <string name="LSLTipText_llCSV2List" translate="false"> +list llCSV2List(string src) +Creates a list from a string of comma separated values + </string> + <string name="LSLTipText_llListRandomize" translate="false"> +list llListRandomize(list src, integer stride) +Returns a randomized list of blocks of size stride + </string> + <string name="LSLTipText_llList2ListStrided" translate="false"> +list llList2ListStrided(list src, integer start, integer end, integer stride) +Copies the strided slice of the list from start to end + </string> + <string name="LSLTipText_llGetRegionCorner" translate="false"> +vector llGetRegionCorner() +Returns a vector in meters that is the global location of the south-west corner of the region which the object is in + </string> + <string name="LSLTipText_llListInsertList" translate="false"> +list llListInsertList(list dest, list src, integer start) +Returns a list that contains all the elements from dest but with the elements from src inserted at position start + </string> + <string name="LSLTipText_llListFindList" translate="false"> +integer llListFindList(list src, list test) +Returns the index of the first instance of test in src. +(Returns -1 if not found) + </string> + <string name="LSLTipText_llGetObjectName" translate="false"> +string llGetObjectName() +Returns the name of the prim which the script is attached to + </string> + <string name="LSLTipText_llSetObjectName" translate="false"> +llSetObjectName(string name) +Sets the prim's name to the name parameter + </string> + <string name="LSLTipText_llGetDate" translate="false"> +string llGetDate() +Returns the current date in the UTC time zone in the format YYYY-MM-DD + </string> + <string name="LSLTipText_llEdgeOfWorld" translate="false"> +integer llEdgeOfWorld(vector pos, vector dir) +Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region) + </string> + <string name="LSLTipText_llGetAgentInfo" translate="false"> +integer llGetAgentInfo(key id) +Returns an integer bitfield containing the agent information about id. +Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR. + </string> + <string name="LSLTipText_llAdjustSoundVolume" translate="false"> +llAdjustSoundVolume(float volume) +Adjusts volume of attached sound (0.0 - 1.0) + </string> + <string name="LSLTipText_llSetSoundQueueing" translate="false"> +llSetSoundQueueing(integer queue) +Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default]) + </string> + <string name="LSLTipText_llSetSoundRadius" translate="false"> +llSetSoundRadius(float radius) +Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered) + </string> + <string name="LSLTipText_llKey2Name" translate="false"> +string llKey2Name(key id) +Returns the name of the prim or avatar specified by id. +(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.) + </string> + <string name="LSLTipText_llSetTextureAnim" translate="false"> +llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate) +Animates the texture on the specified face/faces + </string> + <string name="LSLTipText_llTriggerSoundLimited" translate="false"> +llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west) +Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west + </string> + <string name="LSLTipText_llEjectFromLand" translate="false"> +llEjectFromLand(key avatar) +Ejects avatar from the parcel + </string> + <string name="LSLTipText_llParseString2List" translate="false"> +list llParseString2List(string src, list separators, list spacers) +Breaks src into a list, discarding separators, keeping spacers +(separators and spacers must be lists of strings, maximum of 8 each) + </string> + <string name="LSLTipText_llOverMyLand" translate="false"> +integer llOverMyLand(key id) +Returns TRUE if id is over land owned by the script owner, otherwise FALSE + </string> + <string name="LSLTipText_llGetLandOwnerAt" translate="false"> +key llGetLandOwnerAt(vector pos) +Returns the key of the land owner, returns NULL_KEY if public + </string> + <string name="LSLTipText_llGetNotecardLine" translate="false"> +key llGetNotecardLine(string name, integer line) +Returns line line of notecard name via the dataserver event + </string> + <string name="LSLTipText_llGetAgentSize" translate="false"> +vector llGetAgentSize(key id) +If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR + </string> + <string name="LSLTipText_llSameGroup" translate="false"> +integer llSameGroup(key id) +Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE + </string> + <string name="LSLTipText_llUnSit" translate="false"> +key llUnSit(key id) +If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object's owner, the avatar is forced to stand up + </string> + <string name="LSLTipText_llGroundSlope" translate="false"> +vector llGroundSlope(vector offset) +Returns the ground slope below the object position + offset + </string> + <string name="LSLTipText_llGroundNormal" translate="false"> +vector llGroundNormal(vector offset) +Returns the ground normal below the object position + offset + </string> + <string name="LSLTipText_llGroundContour" translate="false"> +vector llGroundCountour(vector offset) +Returns the ground contour direction below the object position + offset + </string> + <string name="LSLTipText_llGetAttached" translate="false"> +integer llGetAttached() +Returns the object's attachment point, or 0 if not attached + </string> + <string name="LSLTipText_llGetFreeMemory" translate="false"> +integer llGetFreeMemory() +Returns the number of free bytes of memory the script can use + </string> + <string name="LSLTipText_llGetRegionName" translate="false"> +string llGetRegionName() +Returns the current region name + </string> + <string name="LSLTipText_llGetRegionTimeDilation" translate="false"> +float llGetRegionTimeDilation() +Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation) + </string> + <string name="LSLTipText_llGetRegionFPS" translate="false"> +float llGetRegionFPS() +Returns the mean region frames per second + </string> + <string name="LSLTipText_llParticleSystem" translate="false"> +llParticleSystem(list rules) +Creates a particle system based on rules. An empty list removes the particle system. +List format is [ rule1, data1, rule2, data2 . . . rulen, datan ] + </string> + <string name="LSLTipText_llGroundRepel" translate="false"> +llGroundRepel(float height, integer water, float tau) +Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE) + </string> + <string name="LSLTipText_llGiveInventoryList" translate="false"> +llGiveInventoryList(key target, string folder, list inventory) +Gives inventory items to target, creating a new folder to put them in + </string> + <string name="LSLTipText_llSetVehicleType" translate="false"> +llSetVehicleType(integer type) +Sets the vehicle to one of the default types + </string> + <string name="LSLTipText_llSetVehicleFloatParam" translate="false"> +llSetVehicleFloatParam(integer param, float value) +Sets the specified vehicle float parameter + </string> + <string name="LSLTipText_llSetVehicleVectorParam" translate="false"> +llSetVehicleVectorParam(integer param, vector vec) +Sets the specified vehicle vector parameter + </string> + <string name="LSLTipText_llSetVehicleRotationParam" translate="false"> +llSetVehicleVectorParam(integer param, rotation rot) +Sets the specified vehicle rotation parameter + </string> + <string name="LSLTipText_llSetVehicleFlags" translate="false"> +llSetVehicleFlags(integer flags) +Sets the enabled bits in 'flags' + </string> + <string name="LSLTipText_llRemoveVehicleFlags" translate="false"> +llRemoveVehicleFlags(integer flags) +Removes the enabled bits in 'flags' + </string> + <string name="LSLTipText_llSitTarget" translate="false"> +llSitTarget(vector offset, rotation rot) +Sets the sit location for the prim. If offset == <0,0,0> then the sit target is removed. + </string> + <string name="LSLTipText_llAvatarOnSitTarget" translate="false"> +key llAvatarOnSitTarget() +If an avatar is seated on the sit target, returns the avatar's key, otherwise NULL_KEY + </string> + <string name="LSLTipText_llAddToLandPassList" translate="false"> +llAddToLandPassList(key avatar, float hours) +Adds avatar to the land pass list for hours, or indefinitely if hours is 0 + </string> + <string name="LSLTipText_llSetTouchText" translate="false"> +llSetTouchText(string text) +Displays text rather than the default 'Touch' in the pie menu + </string> + <string name="LSLTipText_llSetSitText" translate="false"> +llSetSitText(string text) +Displays text rather than the default 'Sit Here' in the pie menu + </string> + <string name="LSLTipText_llSetCameraEyeOffset" translate="false"> +llSetCameraEyeOffset(vector offset) +Sets the camera eye offset for avatars that sit on the object + </string> + <string name="LSLTipText_llSetCameraAtOffset" translate="false"> +llSetCameraAtOffset(vector offset) +Sets the point the camera is looking at to offset for avatars that sit on the object + </string> + <string name="LSLTipText_llDumpList2String" translate="false"> +string llDumpList2String(list src, string separator) +Returns the list in a single string, using separator between the entries + </string> + <string name="LSLTipText_llScriptDanger" translate="false"> +integer llScriptDanger(vector pos) +Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts + </string> + <string name="LSLTipText_llDialog" translate="false"> +llDialog(key avatar, string message, list buttons, integer chat_channel +Shows a dialog box on the avatar's screen with a message and up to 12 buttons. +If a button is pressed, the avatar says the text of the button label on chat_channel. + </string> + <string name="LSLTipText_llVolumeDetect" translate="false"> +llVolumeDetect(integer detect) +If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating. +Must be applied to the root prim. + </string> + <string name="LSLTipText_llResetOtherScript" translate="false"> +llResetOtherScript(string name) +Resets script name + </string> + <string name="LSLTipText_llGetScriptState" translate="false"> +integer llGetScriptState(string name) +Returns TRUE if the script name is running + </string> + <string name="LSLTipText_llRemoteLoadScript" translate="false"> +DEPRECATED! Please use llRemoteLoadScriptPin instead. + </string> + <string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false"> +llSetRemoteScriptAccessPin(integer pin) +If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored. + </string> + <string name="LSLTipText_llRemoteLoadScriptPin" translate="false"> +llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param) +Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used. +If running == TRUE, starts the script with start_param + </string> + <string name="LSLTipText_llOpenRemoteDataChannel" translate="false"> +llOpenRemoteDataChannel() +Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available + </string> + <string name="LSLTipText_llSendRemoteData" translate="false"> +key llSendRemoteData(key channel, string dest, integer idata, string sdata) +Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata. +Returns a key that is the message_id for the resulting remote_data events. + </string> + <string name="LSLTipText_llRemoteDataReply" translate="false"> +llRemoteDataReply(key channel, key message_id, string sdata, integer idata) +Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata + </string> + <string name="LSLTipText_llCloseRemoteDataChannel" translate="false"> +llCloseRemoteDataChannel(key channel) +Closes XML-RPC channel + </string> + <string name="LSLTipText_llMD5String" translate="false"> +string llMD5String(string src, integer nonce) +Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce + </string> + <string name="LSLTipText_llSetPrimitiveParams" translate="false"> +llSetPrimitiveParams(list rules) +Sets the prim's parameters according to rules + </string> + <string name="LSLTipText_llStringToBase64" translate="false"> +string llStringToBase64(string str) +Converts a string to the Base64 representation of the string + </string> + <string name="LSLTipText_llBase64ToString" translate="false"> +string llBase64ToString(string str) +Converts a Base64 string to a conventional string. +If the conversion creates any unprintable characters, they are converted to spaces. + </string> + <string name="LSLTipText_llXorBase64Strings" translate="false"> +string llXorBase64Strings(string s1, string s2) +DEPRECATED! Please use llXorBase64StringsCorrect instead. +Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string. s2 repeats if it is shorter than s1. Retained for backwards compatability. + </string> + <string name="LSLTipText_llRemoteDataSetRegion" translate="false"> +llRemoteDataSetRegion() +DEPRECATED! Please use llOpenRemoteDataChannel instead. +If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions. + </string> + <string name="LSLTipText_llLog10" translate="false"> +float llLog10(float val) +Returns the base 10 logarithm of val. Returns zero if val <= 0. + </string> + <string name="LSLTipText_llLog" translate="false"> +float llLog(float val) +Returns the natural logarithm of val. Returns zero if val <= 0. + </string> + <string name="LSLTipText_llGetAnimationList" translate="false"> +list llGetAnimationList(key id) +Returns a list of keys of playing animations for avatar described by id + </string> + <string name="LSLTipText_llSetParcelMusicURL" translate="false"> +llSetParcelMusicURL(string url) +Sets the streaming audio URL for the parcel which the object is on + </string> + <string name="LSLTipText_llGetRootPosition" translate="false"> +vector llGetRootPosition() +Returns the position (in region coordinates) of the root prim of the object which the script is attached to + </string> + <string name="LSLTipText_llGetRootRotation" translate="false"> +rotation llGetRootRotation() +Returns the rotation (relative to the region) of the root prim of the object which the script is attached to + </string> + <string name="LSLTipText_llGetObjectDesc" translate="false"> +string llGetObjectDesc() +Returns the description of the prim the script is attached to + </string> + <string name="LSLTipText_llSetObjectDesc" translate="false"> +llSetObjectDesc(string name) +Sets the prim's description + </string> + <string name="LSLTipText_llGetCreator" translate="false"> +key llGetCreator() +Returns a key for the creator of the prim + </string> + <string name="LSLTipText_llGetTimestamp" translate="false"> +string llGetTimestamp() +Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ + </string> + <string name="LSLTipText_llSetLinkAlpha" translate="false"> +llSetLinkAlpha(integer linknumber, float alpha, integer face) +If a prim exists in the link chain at linknumber, sets face to alpha + </string> + <string name="LSLTipText_llGetNumberOfPrims" translate="false"> +integer llGetNumberOfPrims() +Returns the number of prims in a link set the script is attached to + </string> + <string name="LSLTipText_llGetNumberOfNotecardLines" translate="false"> +key llGetNumberOfNotecardLines(string name) +Returns number of lines in notecard name via the dataserver event (cast return value to integer) + </string> + <string name="LSLTipText_llGetBoundingBox" translate="false"> +list llGetBoundingBox(key object) +Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ] + </string> + <string name="LSLTipText_llGetGeometricCenter" translate="false"> +vector llGetGeometricCenter() +Returns the geometric center of the linked set the script is attached to. + </string> + <string name="LSLTipText_llGetPrimitiveParams" translate="false"> +list llGetPrimitiveParams(list params) +Returns the primitive parameters specified in the params list. + </string> + <string name="LSLTipText_llIntegerToBase64" translate="false"> +string llIntegerToBase64(integer number) +Returns a string that is a Base64 big endian encode of number + </string> + <string name="LSLTipText_llBase64ToInteger" translate="false"> +integer llBase64ToInteger(string str) +Returns an integer that is the str Base64 decoded as a big endian integer + </string> + <string name="LSLTipText_llGetGMTclock" translate="false"> +float llGetGMTclock() +Returns the time in seconds since midnight GMT + </string> + <string name="LSLTipText_llGetSimulatorHostname" translate="false"> +string llGetSimulatorHostname() +Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog) + </string> + <string name="LSLTipText_llSetLocalRot" translate="false"> +llSetLocalRot(rotation rot) +Sets the rotation of a child prim relative to the root prim + </string> + <string name="LSLTipText_llParseStringKeepNulls" translate="false"> +list llParseStringKeepNulls(string src, list separators, list spacers) +Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated. +(separators and spacers must be lists of strings, maximum of 8 each) + </string> + <string name="LSLTipText_llRezAtRoot" translate="false"> +llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param) +Instantiates owner's inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter + </string> + <string name="LSLTipText_llGetObjectPermMask" translate="false"> +integer llGetObjectPermMask(integer mask) +Returns the requested permission mask for the root object the task is attached to + </string> + <string name="LSLTipText_llSetObjectPermMask" translate="false"> +llSetObjectPermMask(integer mask, integer value) +Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode) + </string> + <string name="LSLTipText_llGetInventoryPermMask" translate="false"> +integer llGetInventoryPermMask(string item, integer mask) +Returns the requested permission mask for the inventory item + </string> + <string name="LSLTipText_llSetInventoryPermMask" translate="false"> +llSetInventoryPermMask(string item, integer mask, integer value) +Sets the given permission mask to the new value on the inventory item (requires God Mode) + </string> + <string name="LSLTipText_llGetInventoryCreator" translate="false"> +key llGetInventoryCreator(string item) +Returns a key for the creator of the inventory item + </string> + <string name="LSLTipText_llOwnerSay" translate="false"> +llOwnerSay(string msg) +Says msg to owner only. (Owner must be in the same region.) + </string> + <string name="LSLTipText_llRequestSimulatorData" translate="false"> +key llRequestSimulatorData(string simulator, integer data) +Requests data about simulator. When data is available the dataserver event will be raised. + </string> + <string name="LSLTipText_llForceMouselook" translate="false"> +llForceMouselook(integer mouselook) +If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode + </string> + <string name="LSLTipText_llGetObjectMass" translate="false"> +float llGetObjectMass(key id) +Returns the mass of the avatar or object in the region + </string> + <string name="LSLTipText_llListReplaceList" translate="false"> +list llListReplaceList(list dest, list src, integer start, integer end) +Returns a list that is dest with start through end removed and src inserted at start + </string> + <string name="LSLTipText_llLoadURL" translate="false"> +llLoadURL(key avatar, string message, string url) +Shows a dialog to avatar offering to load the web page at url with a message. +If user clicks yes, launches the page in their web browser. + </string> + <string name="LSLTipText_llParcelMediaCommandList" translate="false"> +llParcelMediaCommandList(list command) +Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media + </string> + <string name="LSLTipText_llParcelMediaQuery" translate="false"> +list llParcelMediaQuery(list query) +Returns a list containing results of the sent query + </string> + <string name="LSLTipText_llModPow" translate="false"> +integer llModPow(integer a, integer b, integer c) +Returns a raised to the b power, mod c. ( (a**b)%c ) +b is capped at 0xFFFF (16 bits). + </string> + <string name="LSLTipText_llGetInventoryType" translate="false"> +integer llGetInventoryType(string name) +Returns the type of the inventory item name + </string> + <string name="LSLTipText_llSetPayPrice" translate="false"> +llSetPayPrice(integer price, list quick_pay_buttons) +Sets the default amount on the dialog that appears when someone chooses to pay this prim + </string> + <string name="LSLTipText_llGetCameraPos" translate="false"> +vector llGetCameraPos() +Returns the current camera position for the agent the task has permissions for + </string> + <string name="LSLTipText_llGetCameraRot" translate="false"> +rotation llGetCameraRot() +Returns the current camera orientation for the agent the task has permissions for + </string> + <string name="LSLTipText_llSetPrimURL" translate="false"> +llSetPrimURL(string url) +Updates the URL for the web page shown on the sides of the object + </string> + <string name="LSLTipText_llRefreshPrimURL" translate="false"> +llRefreshPrimURL() +Reloads the web page shown on the sides of the object + </string> + <string name="LSLTipText_llEscapeURL" translate="false"> +string llEscapeURL(string url) +Returns an escaped/encoded version of url, replacing spaces with %20 etc. + </string> + <string name="LSLTipText_llUnescapeURL" translate="false"> +string llUnescapeURL(string url) +Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc. + </string> + <string name="LSLTipText_llMapDestination" translate="false"> +llMapDestination(string simname, vector pos, vector look_at) +Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.) +Only works for scripts attached to avatar, or during touch events. + </string> + <string name="LSLTipText_llAddToLandBanList" translate="false"> +llAddToLandBanList(key avatar, float hours) +Adds avatar to the land ban list for hours, or indefinitely if hours is 0 + </string> + <string name="LSLTipText_llRemoveFromLandPassList" translate="false"> +llRemoveFromLandPassList(key avatar) +Removes avatar from the land pass list + </string> + <string name="LSLTipText_llRemoveFromLandBanList" translate="false"> +llRemoveFromLandBanList(key avatar) +Removes avatar from the land ban list + </string> + <string name="LSLTipText_llSetCameraParams" translate="false"> +llSetCameraParams(list rules) +Sets multiple camera parameters at once. +List format is [ rule1, data1, rule2, data2 . . . rulen, datan ] + </string> + <string name="LSLTipText_llClearCameraParams" translate="false"> +llClearCameraParams() +Resets all camera parameters to default values and turns off scripted camera control + </string> + <string name="LSLTipText_llListStatistics" translate="false"> +float llListStatistics(integer operation, list src) +Performs statistical aggregate functions on list src using LIST_STAT_* operations + </string> + <string name="LSLTipText_llGetUnixTime" translate="false"> +integer llGetUnixTime() +Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock + </string> + <string name="LSLTipText_llGetParcelFlags" translate="false"> +integer llGetParcelFlags(vector pos) +Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos + </string> + <string name="LSLTipText_llGetRegionFlags" translate="false"> +integer llGetRegionFlags() +Returns the region flags (REGION_FLAG_*) for the region the object is in + </string> + <string name="LSLTipText_llXorBase64StringsCorrect" translate="false"> +string llXorBase64StringsCorrect(string s1, string s2) +Correctly performs an exclusive or on two Base64 strings and returns a Base64 string. +s2 repeats if it is shorter than s1. + </string> + <string name="LSLTipText_llHTTPRequest" translate="false"> +llHTTPRequest(string url, list parameters, string body) +Sends an HTTP request to the specified url with the body of the request and parameters + </string> + <string name="LSLTipText_llResetLandBanList" translate="false"> +llResetLandBanList() +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 + </string> + <string name="LSLTipText_llGetObjectPrimCount" translate="false"> +integer llGetObjectPrimCount(key object_id) +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. +Requires owner-like permissions for the parcel. + </string> + <string name="LSLTipText_llGetParcelPrimCount" translate="false"> +integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) +Returns the number of prims on the parcel at pos of the given category. +Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP + </string> + <string name="LSLTipText_llGetParcelMaxPrims" translate="false"> +integer llGetParcelMaxPrims(vector pos, integer sim_wide) +Returns the maximum number of prims allowed on the parcel at pos + </string> + <string name="LSLTipText_llGetParcelDetails" translate="false"> +list llGetParcelDetails(vector pos, list params) +Returns the parcel details specified in params for the parcel at pos. +Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA + </string> + <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false"> +llSetLinkPrimitiveParams(integer linknumber, list rules) +Sets primitive parameters for linknumber based on rules + </string> + <string name="LSLTipText_llSetLinkTexture" translate="false"> +llSetLinkTexture(integer linknumber, string texture, integer face) +Sets the texture of face for a task that exists in the link chain at linknumber + </string> + <string name="LSLTipText_llStringTrim" translate="false"> +string llStringTrim(string src, integer trim_type) +Trims the leading and/or trailing white spaces from a string. +trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL. + </string> + <string name="LSLTipText_llRegionSay" translate="false"> +llRegionSay(integer channel, string msg) +Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel + </string> + <string name="LSLTipText_llGetObjectDetails" translate="false"> +list llGetObjectDetails(key id, list params) +Returns the object details specified in params for the object with key id. +Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR + </string> + <string name="LSLTipText_llSetClickAction" translate="false"> +llSetClickAction(integer action) +Sets the action performed when a prim is clicked upon + </string> + <string name="LSLTipText_llGetRegionAgentCount" translate="false"> +integer llGetRegionAgentCount() +Returns the number of avatars in the region + </string> + <string name="LSLTipText_llTextBox" translate="false"> +llTextBox(key avatar, string message, integer chat_channel +Shows a dialog box on the avatar's screen with the message. +It contains a text box for input, and if entered that text is chatted on chat_channel. + </string> + <string name="LSLTipText_llGetAgentLanguage" translate="false"> +string llGetAgentLanguage(key avatar) +Returns the language code of the preferred interface language of the avatar + </string> + <string name="LSLTipText_llDetectedTouchUV" translate="false"> +vector llDetectedTouchUV(integer index) +Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event + </string> + <string name="LSLTipText_llDetectedTouchFace" translate="false"> +integer llDetectedTouchFace(integer index) +Returns the index of the face where the avatar clicked in a triggered touch event + </string> + <string name="LSLTipText_llDetectedTouchPos" translate="false"> +vector llDetectedTouchPos(integer index) +Returns the position where the object was touched in a triggered touch event + </string> + <string name="LSLTipText_llDetectedTouchNormal" translate="false"> +vector llDetectedTouchNormal(integer index) +Returns the surface normal for a triggered touch event + </string> + <string name="LSLTipText_llDetectedTouchBinormal" translate="false"> +vector llDetectedTouchBinormal(integer index) +Returns the surface binormal for a triggered touch event + </string> + <string name="LSLTipText_llDetectedTouchST" translate="false"> +vector llDetectedTouchST(integer index) +Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event + </string> + <string name="LSLTipText_llSHA1String" translate="false"> +string llSHA1String(string src) +Returns a string of 40 hex characters that is the SHA1 security Hash of src + </string> + <string name="LSLTipText_llGetFreeURLs" translate="false"> +integer llGetFreeURLs() +Returns the number of available URLs for the current script + </string> + <string name="LSLTipText_llRequestURL" translate="false"> +key llRequestURL() +Requests one HTTP:// url for use by this object. +An http_request event is triggered with the results. + </string> + <string name="LSLTipText_llRequestSecureURL" translate="false"> +key llRequestSecureURL() +Requests one HTTPS:// (SSL) url for use by this object. +An http_request event is triggered with the results. + </string> + <string name="LSLTipText_llReleaseURL" translate="false"> +llReleaseURL(string url) +Releases the specified URL, it will no longer be usable + </string> + <string name="LSLTipText_llHTTPResponse" translate="false"> +llHTTPResponse(key request_id, integer status, string body) +Responds to request_id with status and body + </string> + <string name="LSLTipText_llGetHTTPHeader" translate="false"> +string llGetHTTPHeader(key request_id, string header) +Returns the value for header for request_id + </string> + <string name="LSLTipText_llSetPrimMediaParams" translate="false"> +llSetPrimMediaParams(integer face, list params) +Sets the media params for a particular face on an object. If media is not already on this object, add it. +List is a set of name/value pairs in no particular order. Params not specified are unchanged, or if new media is added then set to the default specified. +The possible names are below, along with the types of values and what they mean. + </string> + <string name="LSLTipText_llGetPrimMediaParams" translate="false"> +list llGetPrimMediaParams(integer face, list params) +Returns the media params for a particular face on an object, given the desired list of names, in the order requested. +(Returns an empty list if no media exists on the face.) + </string> + <string name="LSLTipText_llClearPrimMedia" translate="false"> +llClearPrimMedia(integer face) +Clears (deletes) the media and all params from the given face. + </string> + + <!-- Avatar busy/away mode --> + <string name="AvatarSetNotAway">Not Away</string> + <string name="AvatarSetAway">Away</string> + <string name="AvatarSetNotBusy">Not Busy</string> + <string name="AvatarSetBusy">Busy</string> + <!-- Wearable Types --> <string name="shape">Shape</string> <string name="skin">Skin</string> @@ -306,9 +1815,46 @@ <string name="skirt">Skirt</string> <string name="alpha">Alpha</string> <string name="tattoo">Tattoo</string> - <string name="invalid">invalid</string> - - <!-- notify --> + <string name="invalid">invalid</string> + <string name="none">none</string> + + <!-- Not Worn Wearable Types --> + <string name="shirt_not_worn">Shirt not worn</string> + <string name="pants_not_worn">Pants not worn</string> + <string name="shoes_not_worn">Shoes not worn</string> + <string name="socks_not_worn">Socks not worn</string> + <string name="jacket_not_worn">Jacket not worn</string> + <string name="gloves_not_worn">Gloves not worn</string> + <string name="undershirt_not_worn">Undershirt not worn</string> + <string name="underpants_not_worn">Underpants not worn</string> + <string name="skirt_not_worn">Skirt not worn</string> + <string name="alpha_not_worn">Alpha not worn</string> + <string name="tattoo_not_worn">Tattoo not worn</string> + <string name="invalid_not_worn">invalid</string> + + <!-- Create new wearable of the specified type --> + <string name="create_new_shape">Create new shape</string> + <string name="create_new_skin">Create new skin</string> + <string name="create_new_hair">Create new hair</string> + <string name="create_new_eyes">Create new eyes</string> + <string name="create_new_shirt">Create new shirt</string> + <string name="create_new_pants">Create new pants</string> + <string name="create_new_shoes">Create new shoes</string> + <string name="create_new_socks">Create new socks</string> + <string name="create_new_jacket">Create new jacket</string> + <string name="create_new_gloves">Create new gloves</string> + <string name="create_new_undershirt">Create new undershirt</string> + <string name="create_new_underpants">Create new underpants</string> + <string name="create_new_skirt">Create new skirt</string> + <string name="create_new_alpha">Create new alpha</string> + <string name="create_new_tattoo">Create new tattoo</string> + <string name="create_new_invalid">invalid</string> + + <!-- Wearable List--> + <string name="NewWearable">New [WEARABLE_ITEM]</string> + + <!-- LLGroupNotify --> + <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 --> <string name="next">Next</string> <string name="ok">OK</string> <string name="GroupNotifyGroupNotice">Group Notice</string> @@ -318,7 +1864,14 @@ <string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string> <string name="GroupNotifyOpenAttachment">Open Attachment</string> <string name="GroupNotifySaveAttachment">Save Attachment</string> - + + <string name="TeleportOffer">Teleport offering</string> + <!-- start-up toast's string--> + <string name="StartUpNotifications">New notifications arrived while you were away.</string> + <!-- overflow toast's string--> + <string name="OverflowInfoChannelString">You have %d more notification</string> + + <!-- body parts --> <string name="BodyPartsRightArm">Right Arm</string> <string name="BodyPartsHead">Head</string> @@ -331,46 +1884,58 @@ <string name="GraphicsQualityLow">Low</string> <string name="GraphicsQualityMid">Mid</string> <string name="GraphicsQualityHigh">High</string> - + <!-- mouselook --> - <string name="LeaveMouselook">Press ESC to leave Mouselook.</string> - + <string name="LeaveMouselook">Press ESC to return to World View</string> + <!-- inventory --> - <string name="InventoryNoMatchingItems">No matching items found in inventory.</string> - <string name="InventoryNoTexture"> - You do not have a copy of -this texture in your inventory - </string> - <string name="no_transfer"> (no transfer)</string> - <string name="no_modify"> (no modify)</string> - <string name="no_copy"> (no copy)</string> - <string name="worn"> (worn)</string> + <string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string> + <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</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</string> + <!-- use value="" because they have preceding spaces --> + <string name="no_transfer" value=" (no transfer)" /> + <string name="no_modify" value=" (no modify)" /> + <string name="no_copy" value=" (no copy)" /> + <string name="worn" value=" (worn)" /> + <string name="link" value=" (link)" /> + <string name="broken_link" value=" (broken_link)" /> <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> + <string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" /> + <string name="ActiveGesture" value="[GESLABEL] (active)"/> + <!-- Inventory permissions --> + <string name="PermYes">Yes</string> + <string name="PermNo">No</string> <!-- Gestures labels --> - <string name="Chat"> Chat : </string> - <string name="Sound"> Sound : </string> - <string name="Wait"> --- Wait : </string> - <string name="AnimFlagStop"> Stop Animation : </string> - <string name="AnimFlagStart"> Start Animation : </string> - <string name="Wave"> Wave </string> - <string name="HelloAvatar"> Hello, avatar! </string> - + <!-- use value="" because they have preceding spaces --> + <string name="Chat" value=" Chat : " /> + <string name="Sound" value=" Sound : " /> + <string name="Wait" value=" --- Wait : " /> + <string name="AnimFlagStop" value=" Stop Animation : " /> + <string name="AnimFlagStart" value=" Start Animation : " /> + <string name="Wave" value=" Wave " /> + <string name="GestureActionNone" value="None" /> + <string name="HelloAvatar" value=" Hello, avatar! " /> + <string name="ViewAllGestures" value=" View All >>" /> + <string name="GetMoreGestures" value=" Get More >>" /> + <!-- inventory filter --> - <string name="Animations"> Animations,</string> - <string name="Calling Cards"> Calling Cards,</string> - <string name="Clothing"> Clothing,</string> - <string name="Gestures"> Gestures,</string> - <string name="Landmarks"> Landmarks,</string> - <string name="Notecards"> Notecards,</string> - <string name="Objects"> Objects,</string> - <string name="Scripts"> Scripts,</string> - <string name="Sounds"> Sounds,</string> - <string name="Textures"> Textures,</string> - <string name="Snapshots"> Snapshots,</string> - <string name="No Filters"> No </string> - <string name="Since Logoff"> - Since Logoff</string> + <!-- use value="" because they have preceding spaces --> + <string name="Animations" value=" Animations," /> + <string name="Calling Cards" value=" Calling Cards," /> + <string name="Clothing" value=" Clothing," /> + <string name="Gestures" value=" Gestures," /> + <string name="Landmarks" value=" Landmarks," /> + <string name="Notecards" value=" Notecards," /> + <string name="Objects" value=" Objects," /> + <string name="Scripts" value=" Scripts," /> + <string name="Sounds" value=" Sounds," /> + <string name="Textures" value=" Textures," /> + <string name="Snapshots" value=" Snapshots," /> + <string name="No Filters" value="No " /> + <string name="Since Logoff" value=" - Since Logoff" /> <!-- inventory folder --> <string name="InvFolder My Inventory">My Inventory</string> @@ -394,30 +1959,38 @@ this texture in your inventory <string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string> <string name="InvFolder Animations">Animations</string> <string name="InvFolder Gestures">Gestures</string> + <string name="InvFolder Favorite">Favorites</string> + <!-- historically default name of the Favorites folder can start from either "f" or "F" letter. + We should localize both of them with the same value --> <string name="InvFolder favorite">Favorites</string> + <string name="InvFolder Current Outfit">Current Outfit</string> + <string name="InvFolder Initial Outfits">Initial Outfits</string> + <string name="InvFolder My Outfits">My Outfits</string> + <string name="InvFolder Accessories">Accessories</string> + + <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> + <string name="InvFolder Friends">Friends</string> + <string name="InvFolder All">All</string> <!-- inventory FVBridge --> - <string name="NO_COPY"> (no copy)</string> - <string name="NO_MOD"> (no modify)</string> - <string name="NO_XFER"> (no transfer)</string> - + <!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale --> <string name="Buy">Buy</string> <string name="BuyforL$">Buy for L$</string> - + <string name="Stone">Stone</string> <string name="Metal">Metal</string> <string name="Glass">Glass</string> <string name="Wood">Wood</string> <string name="Flesh">Flesh</string> <string name="Plastic">Plastic</string> - <string name="Rubber">Rubber</string> + <string name="Rubber">Rubber</string> <string name="Light">Light</string> - + <!-- keyboard --> <string name="KBShift">Shift</string> <string name="KBCtrl">Ctrl</string> - <!-- Avatar Skeleton --> + <!-- Avatar Skeleton --> <string name="Chest">Chest</string> <string name="Skull">Skull</string> <string name="Left Shoulder">Left Shoulder</string> @@ -447,17 +2020,59 @@ this texture in your inventory <string name="L Lower Leg">L Lower Leg</string> <string name="Stomach">Stomach</string> <string name="Left Pec">Left Pec</string> - <string name="Right Pec">Right Pec</string> - - <!-- HUD Position --> - <string name="Center 2">Center 2</string> - <string name="Top Right">Top Right</string> - <string name="Top">Top</string> - <string name="Top Left">Top Left</string> - <string name="Center">Center</string> - <string name="Bottom Left">Bottom Left</string> - <string name="Bottom">Bottom</string> - <string name="Bottom Right">Bottom Right</string> + <string name="Right Pec">Right Pec</string> + <string name="Invalid Attachment">Invalid Attachment Point</string> + + <!-- Avatar age computation, see LLDateUtil::ageFromDate --> + <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string> + <string name="YearsOld">[AGEYEARS] old</string> + <string name="MonthsOld">[AGEMONTHS] old</string> + <string name="WeeksOld">[AGEWEEKS] old</string> + <string name="DaysOld">[AGEDAYS] old</string> + <string name="TodayOld">Joined today</string> + + <!-- AgeYearsA = singular, + AgeYearsB = plural, + AgeYearsC = plural for non-English languages like Russian + For example, LLTrans::getCountString("AgeYears", 3) is plural form B + in English and form C in Russian --> + <string name="AgeYearsA">[COUNT] year</string> + <string name="AgeYearsB">[COUNT] years</string> + <string name="AgeYearsC">[COUNT] years</string> + <string name="AgeMonthsA">[COUNT] month</string> + <string name="AgeMonthsB">[COUNT] months</string> + <string name="AgeMonthsC">[COUNT] months</string> + <string name="AgeWeeksA">[COUNT] week</string> + <string name="AgeWeeksB">[COUNT] weeks</string> + <string name="AgeWeeksC">[COUNT] weeks</string> + <string name="AgeDaysA">[COUNT] day</string> + <string name="AgeDaysB">[COUNT] days</string> + <string name="AgeDaysC">[COUNT] days</string> + <!-- Group member counts --> + <string name="GroupMembersA">[COUNT] member</string> + <string name="GroupMembersB">[COUNT] members</string> + <string name="GroupMembersC">[COUNT] members</string> + + <!-- Account types, see LLAvatarPropertiesProcessor --> + <string name="AcctTypeResident">Resident</string> + <string name="AcctTypeTrial">Trial</string> + <string name="AcctTypeCharterMember">Charter Member</string> + <string name="AcctTypeEmployee">Linden Lab Employee</string> + <string name="PaymentInfoUsed">Payment Info Used</string> + <string name="PaymentInfoOnFile">Payment Info On File</string> + <string name="NoPaymentInfoOnFile">No Payment Info On File</string> + <string name="AgeVerified">Age-verified</string> + <string name="NotAgeVerified">Not Age-verified</string> + + <!-- HUD Position --> + <string name="Center 2">Center 2</string> + <string name="Top Right">Top Right</string> + <string name="Top">Top</string> + <string name="Top Left">Top Left</string> + <string name="Center">Center</string> + <string name="Bottom Left">Bottom Left</string> + <string name="Bottom">Bottom</string> + <string name="Bottom Right">Bottom Right</string> <!-- compile queue--> <string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string> @@ -479,89 +2094,141 @@ this texture in your inventory <string name="CompileSuccessful">Compile successful!</string> <string name="CompileSuccessfulSaving">Compile successful, saving...</string> <string name="SaveComplete">Save complete.</string> - <string name="ObjectOutOfRange">Script (object out of range)</string> - + <string name="ObjectOutOfRange">Script (object out of range)</string> + <!-- god tools --> <string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string> - + <!-- groups --> <string name="GroupsNone">none</string> - <string name="Group"> (group)</string> + <string name="Group" value=" (group)" /> <string name="Unknown">(Unknown)</string> - <string name="SummaryForTheWeek">Summary for this week, beginning on </string> - <string name="NextStipendDay">The next stipend day is </string> - <string name="GroupIndividualShare"> Group Individual Share - - </string> + <string name="SummaryForTheWeek" value="Summary for this week, beginning on " /> + <string name="NextStipendDay" value="The next stipend day is " /> + <string name="GroupIndividualShare" value=" Group Individual Share" /> + <string name="GroupColumn" value=" Group" /> <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> - <string name="Total">Total</string> - <string name="NoGroupDataFound">No group data found for group </string> - - <!-- floater IM --> + <string name="Total">Total</string> + <string name="NoGroupDataFound">No group data found for group </string> + + <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar. + This is to help Lindens when answering questions. --> <string name="IMParentEstate">parent estate</string> <string name="IMMainland">mainland</string> <string name="IMTeen">teen</string> - + <!-- floater region info --> + <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* --> <string name="RegionInfoError">error</string> <string name="RegionInfoAllEstatesOwnedBy"> - all estates -owned by [OWNER] + all estates owned by [OWNER] </string> - <string name="RegionInfoAllEstatesYouOwn">all estates you owned</string> + <string name="RegionInfoAllEstatesYouOwn">all estates that you own</string> <string name="RegionInfoAllEstatesYouManage"> - all estates that -you managed for [OWNER] + 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 --> + <string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string> + <string name="ScriptLimitsParcelsOwned">Parcels Listed: [PARCELS]</string> + <string name="ScriptLimitsMemoryUsed">Memory used: [COUNT] kb out of [MAX] kb; [AVAILABLE] kb available</string> + <string name="ScriptLimitsMemoryUsedSimple">Memory used: [COUNT] kb</string> + <string name="ScriptLimitsParcelScriptURLs">Parcel Script URLs</string> + <string name="ScriptLimitsURLsUsed">URLs used: [COUNT] out of [MAX]; [AVAILABLE] available</string> + <string name="ScriptLimitsURLsUsedSimple">URLs used: [COUNT]</string> + <string name="ScriptLimitsRequestError">Error requesting information</string> + <string name="ScriptLimitsRequestNoParcelSelected">No Parcel Selected</string> + <string name="ScriptLimitsRequestWrongRegion">Error: script information is only available in your current region</string> + <string name="ScriptLimitsRequestWaiting">Retrieving information...</string> + <string name="ScriptLimitsRequestDontOwnParcel">You do not have permission to examine this parcel</string> + + <string name="SITTING_ON">Sitting On</string> + <string name="ATTACH_CHEST">Chest</string> + <string name="ATTACH_HEAD">Head</string> + <string name="ATTACH_LSHOULDER">Left Shoulder</string> + <string name="ATTACH_RSHOULDER">Right Shoulder</string> + <string name="ATTACH_LHAND">Left Hand</string> + <string name="ATTACH_RHAND">Right Hand</string> + <string name="ATTACH_LFOOT">Left Foot</string> + <string name="ATTACH_RFOOT">Right Foot</string> + <string name="ATTACH_BACK">Back</string> + <string name="ATTACH_PELVIS">Pelvis</string> + <string name="ATTACH_MOUTH">Mouth</string> + <string name="ATTACH_CHIN">Chin</string> + <string name="ATTACH_LEAR">Left Ear</string> + <string name="ATTACH_REAR">Right Ear</string> + <string name="ATTACH_LEYE">Left Eye</string> + <string name="ATTACH_REYE">Right Eye</string> + <string name="ATTACH_NOSE">Nose</string> + <string name="ATTACH_RUARM">Right Upper Arm</string> + <string name="ATTACH_RLARM">Right Lower Arm</string> + <string name="ATTACH_LUARM">Left Upper Arm</string> + <string name="ATTACH_LLARM">Left Lower Arm</string> + <string name="ATTACH_RHIP">Right Hip</string> + <string name="ATTACH_RULEG">Right Upper Leg</string> + <string name="ATTACH_RLLEG">Right Lower Leg</string> + <string name="ATTACH_LHIP">Left Hip</string> + <string name="ATTACH_LULEG">Left Upper Leg</string> + <string name="ATTACH_LLLEG">Left Lower Leg</string> + <string name="ATTACH_BELLY">Belly</string> + <string name="ATTACH_RPEC">Right Pec</string> + <string name="ATTACH_LPEC">Left Pec</string> + <string name="ATTACH_HUD_CENTER_2">HUD Center 2</string> + <string name="ATTACH_HUD_TOP_RIGHT">HUD Top Right</string> + <string name="ATTACH_HUD_TOP_CENTER">HUD Top Center</string> + <string name="ATTACH_HUD_TOP_LEFT">HUD Top Left</string> + <string name="ATTACH_HUD_CENTER_1">HUD Center 1</string> + <string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string> + <string name="ATTACH_HUD_BOTTOM">HUD Bottom</string> + <string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string> + <!-- script editor --> <string name="CursorPos">Line [LINE], Column [COLUMN]</string> - + <!-- panel dir browser --> <string name="PanelDirCountFound">[COUNT] found</string> <string name="PanelDirTimeStr">[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]</string> <!-- panel dir events --> <string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string> - + <!-- panel contents --> - <string name="PanelContentsNewScript">New Script</string> - - <!-- panel avatar --> - <!-- <string name="None">None</string> Duplicate--> - + <string name="PanelContentsTooltip">Content of object</string> + <string name="PanelContentsNewScript">New Script</string> + + <!-- panel preferences general --> + <string name="BusyModeResponseDefault">The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <!-- Mute --> - <string name="MuteByName">(by name)</string> - <string name="MuteAgent">(resident)</string> - <string name="MuteObject">(object)</string> - <string name="MuteGroup">(group)</string> - + <string name="MuteByName">(By name)</string> + <string name="MuteAgent">(Resident)</string> + <string name="MuteObject">(Object)</string> + <string name="MuteGroup">(Group)</string> + <string name="MuteExternal">(External)</string> + <!-- Region/Estate Covenant --> <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> - <string name="covenant_last_modified">Last Modified:</string> - <string name="none_text"> (none) </string> - <string name="never_text"> (never) </string> - + <string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space --> + <string name="none_text" value=" (none) " /> + <string name="never_text" value=" (never) " /> + <!--Region Details--> <string name="GroupOwned">Group Owned</string> <string name="Public">Public</string> - + <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> <string name="ClassifiedUpdateAfterPublish">(will update after publish)</string> - - <!-- group voting dialog --> - <string name="GroupVoteYes">Yes</string> - <string name="GroupVoteNo">No</string> - <string name="GroupVoteNoActiveProposals">There are currently no active proposals</string> - <string name="GroupVoteNoArchivedProposals">There are currently no archived proposals</string> - <string name="GroupVoteRetrievingArchivedProposals">Retrieving archived proposals</string> - <string name="GroupVoteRetrievingActiveProposals">Retrieving active proposals</string> + + <!-- panel picks --> + <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> + <string name="NoAvatarPicksClassifiedsText">User has no picks or classifieds</string> + <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> <string name="MultiPreviewTitle">Preview</string> @@ -576,7 +2243,7 @@ you managed for [OWNER] <string name="InvOfferGaveYou">gave you</string> <string name="InvOfferYouDecline">You decline</string> <string name="InvOfferFrom">from</string> - + <!-- group money --> <string name="GroupMoneyTotal">Total</string> <string name="GroupMoneyBought">bought</string> @@ -588,80 +2255,104 @@ you managed for [OWNER] <string name="GroupMoneyBalance">Balance</string> <string name="GroupMoneyCredits">Credits</string> <string name="GroupMoneyDebits">Debits</string> - + <!-- viewer object --> <string name="ViewerObjectContents">Contents</string> - + <!-- Viewer menu --> <string name="AcquiredItems">Acquired Items</string> - <string name="Cancel">Cancel</string> - <string name="UploadingCosts">Uploading %s costs</string> + <string name="Cancel">Cancel</string> + <string name="UploadingCosts">Uploading [NAME] costs L$ [AMOUNT]</string> + <string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string> <string name="UnknownFileExtension"> Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh - </string> - + </string> + <string name="MuteObject2">Block</string> + <string name="MuteAvatar">Block</string> + <string name="UnmuteObject">Unblock</string> + <string name="UnmuteAvatar">Unblock</string> + <string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string> + <string name="EditLandmarkNavBarMenu">Edit my Landmark...</string> + + <!-- menu accelerators --> + <string name="accel-mac-control">⌃</string> + <string name="accel-mac-command">⌘</string> + <string name="accel-mac-option">⌥</string> + <string name="accel-mac-shift">⇧</string> + <string name="accel-win-control">Ctrl+</string> + <string name="accel-win-alt">Alt+</string> + <string name="accel-win-shift">Shift+</string> + + <string name="Esc">Esc</string> + <string name="Home">Home</string> + <!-- Previews --> - <string name="FileSaved">File Saved</string> - <string name="Receiving">Receiving</string> - + <string name="FileSaved">File Saved</string> + <string name="Receiving">Receiving</string> + <!-- status bar , Time --> - <string name="AM">AM</string> - <string name="PM">PM</string> - <string name="PST">PST</string> - <string name="PDT">PDT</string> + <string name="AM">AM</string> + <string name="PM">PM</string> + <string name="PST">PST</string> + <string name="PDT">PDT</string> <!-- Directions, HUD --> - <string name="Forward">Forward</string> - <string name="Left">Left</string> - <string name="Right">Right</string> - <string name="Back">Back</string> - <string name="North">North</string> - <string name="South">South</string> - <string name="West">West</string> - <string name="East">East</string> - <string name="Up">Up</string> - <string name="Down">Down</string> + <string name="Forward">Forward</string> + <string name="Left">Left</string> + <string name="Right">Right</string> + <string name="Back">Back</string> + <string name="North">North</string> + <string name="South">South</string> + <string name="West">West</string> + <string name="East">East</string> + <string name="Up">Up</string> + <string name="Down">Down</string> <!-- Search Category Strings --> - <string name="Any Category">Any Category</string> - <string name="Shopping">Shopping</string> - <string name="Land Rental">Land Rental</string> - <string name="Property Rental">Property Rental</string> - <string name="Special Attraction">Special Attraction</string> - <string name="New Products">New Products</string> - <string name="Employment">Employment</string> - <string name="Wanted">Wanted</string> - <string name="Service">Service</string> - <string name="Personal">Personal</string> + <string name="Any Category">Any Category</string> + <string name="Shopping">Shopping</string> + <string name="Land Rental">Land Rental</string> + <string name="Property Rental">Property Rental</string> + <string name="Special Attraction">Special Attraction</string> + <string name="New Products">New Products</string> + <string name="Employment">Employment</string> + <string name="Wanted">Wanted</string> + <string name="Service">Service</string> + <string name="Personal">Personal</string> <!-- PARCEL_CATEGORY_UI_STRING --> - <string name="None">None</string> - <string name="Linden Location">Linden Location</string> - <string name="Adult">Adult</string> - <string name="Arts&Culture">Arts & Culture</string> - <string name="Business">Business</string> - <string name="Educational">Educational</string> - <string name="Gaming">Gaming</string> - <string name="Hangout">Hangout</string> - <string name="Newcomer Friendly">Newcomer Friendly</string> + <string name="None">None</string> + <string name="Linden Location">Linden Location</string> + <string name="Adult">Adult</string> + <string name="Arts&Culture">Arts & Culture</string> + <string name="Business">Business</string> + <string name="Educational">Educational</string> + <string name="Gaming">Gaming</string> + <string name="Hangout">Hangout</string> + <string name="Newcomer Friendly">Newcomer Friendly</string> <string name="Parks&Nature">Parks & Nature</string> - <string name="Residential">Residential</string> + <string name="Residential">Residential</string> <!--<string name="Shopping">Shopping</string> --> - <string name="Stage">Stage</string> - <string name="Other">Other</string> - <string name="Any">Any</string> - - <!-- puncutations --> - <string name=":">:</string> - <string name=",">,</string> - <string name="...">...</string> - <string name="***">***</string> - <string name="(">(</string> + <string name="Stage">Stage</string> + <string name="Other">Other</string> + <string name="Any">Any</string> + <string name="You">You</string> + + <!-- punctuations --> + <string name=":">:</string> + <string name=",">,</string> + <string name="...">...</string> + <string name="***">***</string> + <string name="(">(</string> <string name=")">)</string> - <string name=".">.</string> - <string name="'">'</string> - <string name="---">---</string> + <string name=".">.</string> + <string name="'">'</string> + <string name="---">---</string> + + <!-- media --> + <string name="Multiple Media">Multiple Media</string> + <string name="Play Media">Play/Pause Media</string> <!-- OSMessageBox messages --> <string name="MBCmdLineError"> @@ -669,29 +2360,29 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Please see: http://wiki.secondlife.com/wiki/Client_parameters Error: </string> - <string name="MBCmdLineUsg">[SECOND_LIFE] Command line usage:</string> + <string name="MBCmdLineUsg">[APP_NAME] Command line usage:</string> <string name="MBUnableToAccessFile"> - [SECOND_LIFE] is unable to access a file that it needs. + [APP_NAME] is unable to access a file that it needs. This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open. If this message persists, restart your computer and try again. -If it continues to persist, you may need to completely uninstall [SECOND_LIFE] and reinstall it. +If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it. </string> <string name="MBFatalError">Fatal Error</string> - <string name="MBRequiresAltiVec"> [SECOND_LIFE] requires a processor with AltiVec (G4 or later).</string> + <string name="MBRequiresAltiVec"> [APP_NAME] requires a processor with AltiVec (G4 or later).</string> <string name="MBAlreadyRunning"> - [SECOND_LIFE] is already running. + [APP_NAME] is already running. Check your task bar for a minimized copy of the program. If this message persists, restart your computer. </string> <string name="MBFrozenCrashed"> - [SECOND_LIFE] appears to have frozen or crashed on the previous run. + [APP_NAME] appears to have frozen or crashed on the previous run. Would you like to send a crash report? </string> - <string name="MBAlert">Alert</string> + <string name="MBAlert">Notification</string> <string name="MBNoDirectX"> - [SECOND_LIFE] is unable to detect DirectX 9.0b or greater. -[SECOND_LIFE] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes. While you can run [SECOND_LIFE] without it, we highly recommend running with DirectX 9.0b. + [APP_NAME] is unable to detect DirectX 9.0b or greater. +[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes. While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b. Do you wish to continue? </string> @@ -712,77 +2403,874 @@ Running in window. <string name="MBPixelFmtErr">Can't find suitable pixel format</string> <string name="MBPixelFmtDescErr">Can't get pixel format description</string> <string name="MBTrueColorWindow"> - [SECOND_LIFE] requires True Color (32-bit) to run in a window. -Please go to Control Panels > Display > Settings and set the screen to 32-bit color. -Alternately, if you choose to run fullscreen, [SECOND_LIFE] will automatically adjust the screen each time it runs. + [APP_NAME] requires True Color (32-bit) to run. +Please go to your computer's display settings and set the color mode to 32-bit. </string> <string name="MBAlpha"> - [SECOND_LIFE] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. + [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. Please make sure you have the latest video card drivers installed. Also be sure your monitor is set to True Color (32-bit) in Control Panels > Display > Settings. -If you continue to receive this message, contact customer support. +If you continue to receive this message, contact the [SUPPORT_SITE]. </string> <string name="MBPixelFmtSetErr">Can't set pixel format</string> <string name="MBGLContextErr">Can't create GL rendering context</string> <string name="MBGLContextActErr">Can't activate GL rendering context</string> <string name="MBVideoDrvErr"> - [SECOND_LIFE] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them. + [APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them. -If you continue to receive this message, contact customer support. +If you continue to receive this message, contact the [SUPPORT_SITE]. </string> - <!-- Group Information --> - - - <!-- Locale Information --> - <string name="MicrosoftLocale">english</string> - <string name="DarwinLocale">C</string> - <string name="LinuxLocale">C</string> - - <!-- - datetimeToCodes["wkday"] = "%a"; // Thu - datetimeToCodes["weekday"] = "%A"; // Thursday - datetimeToCodes["year4"] = "%Y"; // 2009 - datetimeToCodes["year"] = "%Y"; // 2009 - datetimeToCodes["year2"] = "%y"; // 09 - datetimeToCodes["mth"] = "%b"; // Aug - datetimeToCodes["month"] = "%B"; // August - datetimeToCodes["mthnum"] = "%m"; // 08 - datetimeToCodes["day"] = "%d"; // 31 - datetimeToCodes["hour24"] = "%H"; // 14 - datetimeToCodes["hour"] = "%H"; // 14 - datetimeToCodes["hour12"] = "%I"; // 02 - datetimeToCodes["min"] = "%M"; // 59 - datetimeToCodes["ampm"] = "%p"; // AM - datetimeToCodes["second"] = "%S"; // 59 - datetimeToCodes["timezone"] = "%Z"; // PST - --> - - <string name="TimeHour">hour,datetime,slt</string> - <string name="TimeMin">min,datetime,slt</string> - <string name="TimeYear">year,datetime,slt</string> - <string name="TimeDay">day,datetime,slt</string> - <string name="TimeMonth">mthnum,datetime,slt</string> - <string name="TimeWeek">wkday,datetime,slt</string> - <string name="TimeAMPM">ampm,datetime,slt</string> - <string name="TimeHour12">hour12,datetime,slt</string> - - <string name="LTimeMthNum">mthnum,datetime,local</string> - <string name="LTimeWeek">wkday,datetime,local</string> - <string name="LTimeMonth">mth,datetime,local</string> - <string name="LTimeDay">day,datetime,local</string> - <string name="LTimeSec">second,datetime,local</string> - <string name="LTimeHour">hour,datetime,local</string> - <string name="LTimeMin">min,datetime,local</string> - <string name="LTimeYear">year,datetime,local</string> - <string name="LTimeSec">second,datetime,local</string> - - <string name="UTCTimeWeek">weekday,datetime,utc</string> - <string name="UTCTimeDay">day,datetime,utc</string> - <string name="UTCTimeMth">mth,datetime,utc</string> - <string name="UTCTimeYr">year,datetime,utc</string> - <string name="UTCTimeHr">hour,datetime,utc</string> - <string name="UTCTimeMin">min,datetime,utc</string> - <string name="UTCTimeSec">second,datetime,utc</string> - <string name="UTCTimeTimezone">timezone,datetime,utc</string> -</strings> + <!-- Avatar Shape Information --> +<string name="5 O'Clock Shadow">5 O'Clock Shadow</string> + +<string name="All White">All White</string> +<string name="Anime Eyes">Anime Eyes</string> +<string name="Arced">Arced</string> +<string name="Arm Length">Arm Length</string> +<string name="Attached">Attached</string> +<string name="Attached Earlobes">Attached Earlobes</string> + + +<string name="Back Fringe">Back Fringe</string> + +<string name="Baggy">Baggy</string> +<string name="Bangs">Bangs</string> + +<string name="Beady Eyes">Beady Eyes</string> +<string name="Belly Size">Belly Size</string> +<string name="Big">Big</string> +<string name="Big Butt">Big Butt</string> + +<string name="Big Hair Back">Big Hair: Back</string> +<string name="Big Hair Front">Big Hair: Front</string> +<string name="Big Hair Top">Big Hair: Top</string> +<string name="Big Head">Big Head</string> +<string name="Big Pectorals">Big Pectorals</string> +<string name="Big Spikes">Big Spikes</string> +<string name="Black">Black</string> +<string name="Blonde">Blonde</string> +<string name="Blonde Hair">Blonde Hair</string> +<string name="Blush">Blush</string> +<string name="Blush Color">Blush Color</string> +<string name="Blush Opacity">Blush Opacity</string> +<string name="Body Definition">Body Definition</string> +<string name="Body Fat">Body Fat</string> +<string name="Body Freckles">Body Freckles</string> +<string name="Body Thick">Body Thick</string> +<string name="Body Thickness">Body Thickness</string> +<string name="Body Thin">Body Thin</string> + +<string name="Bow Legged">Bow Legged</string> +<string name="Breast Buoyancy">Breast Buoyancy</string> +<string name="Breast Cleavage">Breast Cleavage</string> +<string name="Breast Size">Breast Size</string> +<string name="Bridge Width">Bridge Width</string> +<string name="Broad">Broad</string> +<string name="Brow Size">Brow Size</string> +<string name="Bug Eyes">Bug Eyes</string> +<string name="Bugged Eyes">Bugged Eyes</string> +<string name="Bulbous">Bulbous</string> +<string name="Bulbous Nose">Bulbous Nose</string> + + +<string name="Bushy Eyebrows">Bushy Eyebrows</string> +<string name="Bushy Hair">Bushy Hair</string> +<string name="Butt Size">Butt Size</string> +<string name="bustle skirt">Bustle Skirt</string> +<string name="no bustle">No Bustle</string> +<string name="more bustle">More Bustle</string> + +<string name="Chaplin">Chaplin</string> +<string name="Cheek Bones">Cheek Bones</string> +<string name="Chest Size">Chest Size</string> +<string name="Chin Angle">Chin Angle</string> +<string name="Chin Cleft">Chin Cleft</string> +<string name="Chin Curtains">Chin Curtains</string> + +<string name="Chin Depth">Chin Depth</string> +<string name="Chin Heavy">Chin Heavy</string> +<string name="Chin In">Chin In</string> +<string name="Chin Out">Chin Out</string> +<string name="Chin-Neck">Chin-Neck</string> +<string name="Clear">Clear</string> +<string name="Cleft">Cleft</string> +<string name="Close Set Eyes">Close Set Eyes</string> +<string name="Closed">Closed</string> +<string name="Closed Back">Closed Back</string> +<string name="Closed Front">Closed Front</string> +<string name="Closed Left">Closed Left</string> +<string name="Closed Right">Closed Right</string> +<string name="Coin Purse">Coin Purse</string> +<string name="Collar Back">Collar Back</string> + + + +<string name="Collar Front">Collar Front</string> + + + +<string name="Corner Down">Corner Down</string> + +<string name="Corner Up">Corner Up</string> +<string name="Creased">Creased</string> +<string name="Crooked Nose">Crooked Nose</string> + +<string name="Cuff Flare">Cuff Flare</string> +<string name="Dark">Dark</string> +<string name="Dark Green">Dark Green</string> +<string name="Darker">Darker</string> +<string name="Deep">Deep</string> +<string name="Default Heels">Default Heels</string> + +<string name="Dense">Dense</string> + +<string name="Double Chin">Double Chin</string> +<string name="Downturned">Downturned</string> +<string name="Duffle Bag">Duffle Bag</string> +<string name="Ear Angle">Ear Angle</string> +<string name="Ear Size">Ear Size</string> +<string name="Ear Tips">Ear Tips</string> +<string name="Egg Head">Egg Head</string> +<string name="Eye Bags">Eye Bags</string> +<string name="Eye Color">Eye Color</string> +<string name="Eye Depth">Eye Depth</string> +<string name="Eye Lightness">Eye Lightness</string> +<string name="Eye Opening">Eye Opening</string> +<string name="Eye Pop">Eye Pop</string> +<string name="Eye Size">Eye Size</string> +<string name="Eye Spacing">Eye Spacing</string> + +<string name="Eyebrow Arc">Eyebrow Arc</string> +<string name="Eyebrow Density">Eyebrow Density</string> + +<string name="Eyebrow Height">Eyebrow Height</string> +<string name="Eyebrow Points">Eyebrow Points</string> +<string name="Eyebrow Size">Eyebrow Size</string> + +<string name="Eyelash Length">Eyelash Length</string> +<string name="Eyeliner">Eyeliner</string> +<string name="Eyeliner Color">Eyeliner Color</string> + +<string name="Eyes Bugged">Eyes Bugged</string> + + + + + + + + +<string name="Face Shear">Face Shear</string> +<string name="Facial Definition">Facial Definition</string> +<string name="Far Set Eyes">Far Set Eyes</string> + +<string name="Fat Lips">Fat Lips</string> + +<string name="Female">Female</string> +<string name="Fingerless">Fingerless</string> +<string name="Fingers">Fingers</string> +<string name="Flared Cuffs">Flared Cuffs</string> +<string name="Flat">Flat</string> +<string name="Flat Butt">Flat Butt</string> +<string name="Flat Head">Flat Head</string> +<string name="Flat Toe">Flat Toe</string> +<string name="Foot Size">Foot Size</string> +<string name="Forehead Angle">Forehead Angle</string> +<string name="Forehead Heavy">Forehead Heavy</string> +<string name="Freckles">Freckles</string> + +<string name="Front Fringe">Front Fringe</string> + +<string name="Full Back">Full Back</string> +<string name="Full Eyeliner">Full Eyeliner</string> +<string name="Full Front">Full Front</string> +<string name="Full Hair Sides">Full Hair Sides</string> +<string name="Full Sides">Full Sides</string> +<string name="Glossy">Glossy</string> +<string name="Glove Fingers">Glove Fingers</string> + +<string name="Glove Length">Glove Length</string> + + +<string name="Hair">Hair</string> +<string name="Hair Back">Hair: Back</string> +<string name="Hair Front">Hair: Front</string> +<string name="Hair Sides">Hair: Sides</string> +<string name="Hair Sweep">Hair Sweep</string> +<string name="Hair Thickess">Hair Thickness</string> +<string name="Hair Thickness">Hair Thickness</string> +<string name="Hair Tilt">Hair Tilt</string> +<string name="Hair Tilted Left">Hair Tilted Left</string> +<string name="Hair Tilted Right">Hair Tilted Right</string> +<string name="Hair Volume">Hair: Volume</string> +<string name="Hand Size">Hand Size</string> +<string name="Handlebars">Handlebars</string> +<string name="Head Length">Head Length</string> +<string name="Head Shape">Head Shape</string> +<string name="Head Size">Head Size</string> +<string name="Head Stretch">Head Stretch</string> +<string name="Heel Height">Heel Height</string> +<string name="Heel Shape">Heel Shape</string> +<string name="Height">Height</string> +<string name="High">High</string> +<string name="High Heels">High Heels</string> +<string name="High Jaw">High Jaw</string> +<string name="High Platforms">High Platforms</string> +<string name="High and Tight">High and Tight</string> +<string name="Higher">Higher</string> +<string name="Hip Length">Hip Length</string> +<string name="Hip Width">Hip Width</string> +<string name="In">In</string> +<string name="In Shdw Color">Inner Shadow Color</string> +<string name="In Shdw Opacity">Inner Shadow Opacity</string> +<string name="Inner Eye Corner">Inner Eye Corner</string> +<string name="Inner Eye Shadow">Inner Eye Shadow</string> +<string name="Inner Shadow">Inner Shadow</string> + + +<string name="Jacket Length">Jacket Length</string> + +<string name="Jacket Wrinkles">Jacket Wrinkles</string> +<string name="Jaw Angle">Jaw Angle</string> +<string name="Jaw Jut">Jaw Jut</string> +<string name="Jaw Shape">Jaw Shape</string> +<string name="Join">Join</string> +<string name="Jowls">Jowls</string> +<string name="Knee Angle">Knee Angle</string> +<string name="Knock Kneed">Knock Kneed</string> + +<string name="Large">Large</string> +<string name="Large Hands">Large Hands</string> +<string name="Left Part">Left Part</string> +<string name="Leg Length">Leg Length</string> +<string name="Leg Muscles">Leg Muscles</string> +<string name="Less">Less</string> +<string name="Less Body Fat">Less Body Fat</string> +<string name="Less Curtains">Less Curtains</string> +<string name="Less Freckles">Less Freckles</string> +<string name="Less Full">Less Full</string> +<string name="Less Gravity">Less Gravity</string> +<string name="Less Love">Less Love</string> +<string name="Less Muscles">Less Muscles</string> +<string name="Less Muscular">Less Muscular</string> +<string name="Less Rosy">Less Rosy</string> +<string name="Less Round">Less Round</string> +<string name="Less Saddle">Less Saddle</string> +<string name="Less Square">Less Square</string> +<string name="Less Volume">Less Volume</string> +<string name="Less soul">Less soul</string> +<string name="Lighter">Lighter</string> +<string name="Lip Cleft">Lip Cleft</string> +<string name="Lip Cleft Depth">Lip Cleft Depth</string> +<string name="Lip Fullness">Lip Fullness</string> +<string name="Lip Pinkness">Lip Pinkness</string> +<string name="Lip Ratio">Lip Ratio</string> +<string name="Lip Thickness">Lip Thickness</string> +<string name="Lip Width">Lip Width</string> +<string name="Lipgloss">Lipgloss</string> +<string name="Lipstick">Lipstick</string> +<string name="Lipstick Color">Lipstick Color</string> +<string name="Long">Long</string> +<string name="Long Head">Long Head</string> +<string name="Long Hips">Long Hips</string> +<string name="Long Legs">Long Legs</string> +<string name="Long Neck">Long Neck</string> +<string name="Long Pigtails">Long Pigtails</string> +<string name="Long Ponytail">Long Ponytail</string> +<string name="Long Torso">Long Torso</string> +<string name="Long arms">Long arms</string> + + +<string name="Loose Pants">Loose Pants</string> +<string name="Loose Shirt">Loose Shirt</string> +<string name="Loose Sleeves">Loose Sleeves</string> + +<string name="Love Handles">Love Handles</string> +<string name="Low">Low</string> +<string name="Low Heels">Low Heels</string> +<string name="Low Jaw">Low Jaw</string> +<string name="Low Platforms">Low Platforms</string> +<string name="Low and Loose">Low and Loose</string> +<string name="Lower">Lower</string> +<string name="Lower Bridge">Lower Bridge</string> +<string name="Lower Cheeks">Lower Cheeks</string> + +<string name="Male">Male</string> +<string name="Middle Part">Middle Part</string> +<string name="More">More</string> +<string name="More Blush">More Blush</string> +<string name="More Body Fat">More Body Fat</string> +<string name="More Curtains">More Curtains</string> +<string name="More Eyeshadow">More Eyeshadow</string> +<string name="More Freckles">More Freckles</string> +<string name="More Full">More Full</string> +<string name="More Gravity">More Gravity</string> +<string name="More Lipstick">More Lipstick</string> +<string name="More Love">More Love</string> +<string name="More Lower Lip">More Lower Lip</string> +<string name="More Muscles">More Muscles</string> +<string name="More Muscular">More Muscular</string> +<string name="More Rosy">More Rosy</string> +<string name="More Round">More Round</string> +<string name="More Saddle">More Saddle</string> +<string name="More Sloped">More Sloped</string> +<string name="More Square">More Square</string> +<string name="More Upper Lip">More Upper Lip</string> +<string name="More Vertical">More Vertical</string> +<string name="More Volume">More Volume</string> +<string name="More soul">More soul</string> +<string name="Moustache">Moustache</string> + +<string name="Mouth Corner">Mouth Corner</string> +<string name="Mouth Position">Mouth Position</string> +<string name="Mowhawk">Mowhawk</string> +<string name="Muscular">Muscular</string> +<string name="Mutton Chops">Mutton Chops</string> + +<string name="Nail Polish">Nail Polish</string> +<string name="Nail Polish Color">Nail Polish Color</string> +<string name="Narrow">Narrow</string> +<string name="Narrow Back">Narrow Back</string> +<string name="Narrow Front">Narrow Front</string> +<string name="Narrow Lips">Narrow Lips</string> +<string name="Natural">Natural</string> +<string name="Neck Length">Neck Length</string> +<string name="Neck Thickness">Neck Thickness</string> +<string name="No Blush">No Blush</string> +<string name="No Eyeliner">No Eyeliner</string> +<string name="No Eyeshadow">No Eyeshadow</string> + +<string name="No Lipgloss">No Lipgloss</string> +<string name="No Lipstick">No Lipstick</string> +<string name="No Part">No Part</string> +<string name="No Polish">No Polish</string> +<string name="No Red">No Red</string> +<string name="No Spikes">No Spikes</string> +<string name="No White">No White</string> +<string name="No Wrinkles">No Wrinkles</string> +<string name="Normal Lower">Normal Lower</string> +<string name="Normal Upper">Normal Upper</string> +<string name="Nose Left">Nose Left</string> +<string name="Nose Right">Nose Right</string> +<string name="Nose Size">Nose Size</string> +<string name="Nose Thickness">Nose Thickness</string> +<string name="Nose Tip Angle">Nose Tip Angle</string> +<string name="Nose Tip Shape">Nose Tip Shape</string> +<string name="Nose Width">Nose Width</string> +<string name="Nostril Division">Nostril Division</string> +<string name="Nostril Width">Nostril Width</string> + + +<string name="Opaque">Opaque</string> +<string name="Open">Open</string> +<string name="Open Back">Open Back</string> +<string name="Open Front">Open Front</string> +<string name="Open Left">Open Left</string> +<string name="Open Right">Open Right</string> +<string name="Orange">Orange</string> +<string name="Out">Out</string> +<string name="Out Shdw Color">Outer Shadow Color</string> +<string name="Out Shdw Opacity">Outer Shadow Opacity</string> +<string name="Outer Eye Corner">Outer Eye Corner</string> +<string name="Outer Eye Shadow">Outer Eye Shadow</string> +<string name="Outer Shadow">Outer Shadow</string> +<string name="Overbite">Overbite</string> + +<string name="Package">Package</string> +<string name="Painted Nails">Painted Nails</string> +<string name="Pale">Pale</string> +<string name="Pants Crotch">Pants Crotch</string> +<string name="Pants Fit">Pants Fit</string> +<string name="Pants Length">Pants Length</string> + + +<string name="Pants Waist">Pants Waist</string> +<string name="Pants Wrinkles">Pants Wrinkles</string> +<string name="Part">Part</string> +<string name="Part Bangs">Part Bangs</string> +<string name="Pectorals">Pectorals</string> +<string name="Pigment">Pigment</string> +<string name="Pigtails">Pigtails</string> +<string name="Pink">Pink</string> +<string name="Pinker">Pinker</string> +<string name="Platform Height">Platform Height</string> +<string name="Platform Width">Platform Width</string> +<string name="Pointy">Pointy</string> +<string name="Pointy Heels">Pointy Heels</string> + +<string name="Ponytail">Ponytail</string> +<string name="Poofy Skirt">Poofy Skirt</string> +<string name="Pop Left Eye">Pop Left Eye</string> +<string name="Pop Right Eye">Pop Right Eye</string> +<string name="Puffy">Puffy</string> +<string name="Puffy Eyelids">Puffy Eyelids</string> +<string name="Rainbow Color">Rainbow Color</string> +<string name="Red Hair">Red Hair</string> + +<string name="Regular">Regular</string> + +<string name="Right Part">Right Part</string> +<string name="Rosy Complexion">Rosy Complexion</string> +<string name="Round">Round</string> + +<string name="Ruddiness">Ruddiness</string> +<string name="Ruddy">Ruddy</string> +<string name="Rumpled Hair">Rumpled Hair</string> +<string name="Saddle Bags">Saddle Bags</string> + + +<string name="Scrawny Leg">Scrawny Leg</string> +<string name="Separate">Separate</string> + + +<string name="Shallow">Shallow</string> +<string name="Shear Back">Shear Back</string> +<string name="Shear Face">Shear Face</string> +<string name="Shear Front">Shear Front</string> + +<string name="Shear Left Up">Shear Left Up</string> + +<string name="Shear Right Up">Shear Right Up</string> +<string name="Sheared Back">Sheared Back</string> +<string name="Sheared Front">Sheared Front</string> +<string name="Shift Left">Shift Left</string> +<string name="Shift Mouth">Shift Mouth</string> +<string name="Shift Right">Shift Right</string> +<string name="Shirt Bottom">Shirt Bottom</string> + +<string name="Shirt Fit">Shirt Fit</string> + +<string name="Shirt Wrinkles">Shirt Wrinkles</string> +<string name="Shoe Height">Shoe Height</string> + +<string name="Short">Short</string> +<string name="Short Arms">Short Arms</string> +<string name="Short Legs">Short Legs</string> +<string name="Short Neck">Short Neck</string> +<string name="Short Pigtails">Short Pigtails</string> +<string name="Short Ponytail">Short Ponytail</string> +<string name="Short Sideburns">Short Sideburns</string> +<string name="Short Torso">Short Torso</string> +<string name="Short hips">Short hips</string> +<string name="Shoulders">Shoulders</string> + +<string name="Side Fringe">Side Fringe</string> +<string name="Sideburns">Sideburns</string> + +<string name="Sides Hair">Sides Hair</string> +<string name="Sides Hair Down">Sides Hair Down</string> +<string name="Sides Hair Up">Sides Hair Up</string> + +<string name="Skinny Neck">Skinny Neck</string> +<string name="Skirt Fit">Skirt Fit</string> +<string name="Skirt Length">Skirt Length</string> +<string name="Slanted Forehead">Slanted Forehead</string> +<string name="Sleeve Length">Sleeve Length</string> + + + +<string name="Sleeve Looseness">Sleeve Looseness</string> +<string name="Slit Back">Slit: Back</string> +<string name="Slit Front">Slit: Front</string> +<string name="Slit Left">Slit: Left</string> +<string name="Slit Right">Slit: Right</string> +<string name="Small">Small</string> +<string name="Small Hands">Small Hands</string> +<string name="Small Head">Small Head</string> +<string name="Smooth">Smooth</string> +<string name="Smooth Hair">Smooth Hair</string> +<string name="Socks Length">Socks Length</string> + + +<string name="Soulpatch">Soulpatch</string> + +<string name="Sparse">Sparse</string> +<string name="Spiked Hair">Spiked Hair</string> +<string name="Square">Square</string> +<string name="Square Toe">Square Toe</string> +<string name="Squash Head">Squash Head</string> + +<string name="Stretch Head">Stretch Head</string> +<string name="Sunken">Sunken</string> +<string name="Sunken Chest">Sunken Chest</string> +<string name="Sunken Eyes">Sunken Eyes</string> +<string name="Sweep Back">Sweep Back</string> +<string name="Sweep Forward">Sweep Forward</string> + +<string name="Tall">Tall</string> +<string name="Taper Back">Taper Back</string> +<string name="Taper Front">Taper Front</string> +<string name="Thick Heels">Thick Heels</string> +<string name="Thick Neck">Thick Neck</string> +<string name="Thick Toe">Thick Toe</string> + +<string name="Thin">Thin</string> +<string name="Thin Eyebrows">Thin Eyebrows</string> +<string name="Thin Lips">Thin Lips</string> +<string name="Thin Nose">Thin Nose</string> +<string name="Tight Chin">Tight Chin</string> +<string name="Tight Cuffs">Tight Cuffs</string> +<string name="Tight Pants">Tight Pants</string> +<string name="Tight Shirt">Tight Shirt</string> +<string name="Tight Skirt">Tight Skirt</string> +<string name="Tight Sleeves">Tight Sleeves</string> + +<string name="Toe Shape">Toe Shape</string> +<string name="Toe Thickness">Toe Thickness</string> +<string name="Torso Length">Torso Length</string> +<string name="Torso Muscles">Torso Muscles</string> +<string name="Torso Scrawny">Torso Scrawny</string> +<string name="Unattached">Unattached</string> +<string name="Uncreased">Uncreased</string> +<string name="Underbite">Underbite</string> +<string name="Unnatural">Unnatural</string> +<string name="Upper Bridge">Upper Bridge</string> +<string name="Upper Cheeks">Upper Cheeks</string> +<string name="Upper Chin Cleft">Upper Chin Cleft</string> + +<string name="Upper Eyelid Fold">Upper Eyelid Fold</string> +<string name="Upturned">Upturned</string> +<string name="Very Red">Very Red</string> +<string name="Waist Height">Waist Height</string> + + +<string name="Well-Fed">Well-Fed</string> +<string name="White Hair">White Hair</string> +<string name="Wide">Wide</string> +<string name="Wide Back">Wide Back</string> +<string name="Wide Front">Wide Front</string> +<string name="Wide Lips">Wide Lips</string> +<string name="Wild">Wild</string> +<string name="Wrinkles">Wrinkles</string> + + <!-- Navigation bar location input control. + Strings are here because widget xml is not localizable --> + <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> + <string name="LocationCtrlEditLandmarkTooltip">Edit my Landmark</string> + <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> + <string name="LocationCtrlComboBtnTooltip">My location history</string> + <string name="LocationCtrlForSaleTooltip">Buy this land</string> + <string name="LocationCtrlVoiceTooltip">Voice not available here</string> + <string name="LocationCtrlFlyTooltip">Flying not allowed</string> + <string name="LocationCtrlPushTooltip">No pushing</string> + <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string> + <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string> + <string name="LocationCtrlDamageTooltip">Health</string> + <string name="LocationCtrlAdultIconTooltip">Adult Region</string> + <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> + <string name="LocationCtrlGeneralIconTooltip">General Region</string> + + <!-- Strings used by the (currently Linux) auto-updater app --> + <string name="UpdaterWindowTitle"> + [APP_NAME] Update + </string> + <string name="UpdaterNowUpdating"> + Now updating [APP_NAME]... + </string> + <string name="UpdaterNowInstalling"> + Installing [APP_NAME]... + </string> + <string name="UpdaterUpdatingDescriptive"> + Your [APP_NAME] Viewer is being updated to the latest release. This may take some time, so please be patient. + </string> + <string name="UpdaterProgressBarTextWithEllipses"> + Downloading update... + </string> + <string name="UpdaterProgressBarText"> + Downloading update + </string> + <string name="UpdaterFailDownloadTitle"> + Failed to download update + </string> + <string name="UpdaterFailUpdateDescriptive"> + An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com. + </string> + <string name="UpdaterFailInstallTitle"> + Failed to install update + </string> + <string name="UpdaterFailStartTitle"> + Failed to start viewer + </string> + + <!-- System Messages --> + <string name="ItemsComingInTooFastFrom">[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds</string> + <string name="ItemsComingInTooFast">[APP_NAME]: Items coming in too fast, automatic preview disabled for [TIME] seconds</string> + + <!-- IM system messages --> + <string name="IM_logging_string">-- Instant message logging enabled --</string> + <string name="IM_typing_start_string">[NAME] is typing...</string> + <string name="Unnamed">(Unnamed)</string> + <string name="IM_moderated_chat_label">(Moderated: Voices off by default)</string> + <string name="IM_unavailable_text_label">Text chat is not available for this call.</string> + <string name="IM_muted_text_label">Your text chat has been disabled by a Group Moderator.</string> + <string name="IM_default_text_label">Click here to instant message.</string> + <string name="IM_to_label">To</string> + <string name="IM_moderator_label">(Moderator)</string> + <string name="Saved_message">(Saved [LONG_TIMESTAMP])</string> + + <!-- voice calls --> + <string name="answered_call">Your call has been answered</string> + <string name="you_started_call">You started a voice call</string> + <string name="you_joined_call">You joined the voice call</string> + <string name="name_started_call">[NAME] started a voice call</string> + + <string name="ringing-im"> + Joining voice call... + </string> + <string name="connected-im"> + Connected, click Leave Call to hang up + </string> + <string name="hang_up-im"> + Left voice call + </string> + <string name="answering-im"> + Connecting... + </string> + <string name="conference-title"> + Ad-hoc Conference + </string> + <string name="conference-title-incoming"> + Conference with [AGENT_NAME] + </string> + <string name="inventory_item_offered-im"> + Inventory item offered + </string> + <string name="share_alert"> + Drag items from inventory here + </string> + + + <string name="no_session_message"> + (IM Session Doesn't Exist) + </string> + <string name="only_user_message"> + You are the only user in this session. + </string> + <string name="offline_message"> + [FIRST] [LAST] is offline. + </string> + <string name="invite_message"> + 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. + </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name. + Also there are some other places where "generic" is used. + So, let add string with name="generic" with the same value as "generic_request_error" --> + <string name="generic"> + Error making request, please try again later. + </string> + <string name="generic_request_error"> + Error making request, please try again later. + </string> + <string name="insufficient_perms_error"> + You do not have sufficient permissions. + </string> + <string name="session_does_not_exist_error"> + The session no longer exists + </string> + <string name="no_ability_error"> + You do not have that ability. + </string> + <string name="no_ability"> + You do not have that ability. + </string> + <string name="not_a_mod_error"> + You are not a session moderator. + </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="muted" with the same value as "muted_error" --> + <string name="muted"> + A group moderator disabled your text chat. + </string> + <string name="muted_error"> + A group moderator disabled your text chat. + </string> + <string name="add_session_event"> + Unable to add users to chat session with [RECIPIENT]. + </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="message" with the same value as "message_session_event" --> + <string name="message"> + Unable to send your message to the chat session with [RECIPIENT]. + </string> + <string name="message_session_event"> + Unable to send your message to the chat session with [RECIPIENT]. + </string> + <string name="mute"> + Error while moderating. + </string> + <!--Some times string name is getting from the body of server response. + For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. + In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name. + So, let add string with name="removed" with the same value as "removed_from_group" --> + <string name="removed"> + You have been removed from the group. + </string> + <string name="removed_from_group"> + You have been removed from the group. + </string> + <string name="close_on_no_ability"> + You no longer have the ability to be in the chat session. + </string> + <string name="unread_chat_single"> + [SOURCES] has said something new + </string> + <string name="unread_chat_multiple"> + [SOURCES] have said something new + </string> + <string name="session_initialization_timed_out_error"> + The session initialization is timed out + </string> + + <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</string> + + <!-- Financial operations strings --> + <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> + <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string> + <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string> + <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> + <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> + <string name="for a parcel of land">for a parcel of land</string> + <string name="for a land access pass">for a land access pass</string> + <string name="for deeding land">for deeding land</string> + <string name="to create a group">to create a group</string> + <string name="to join a group">to join a group</string> + <string name="to upload">to upload</string> + + <string name="giving">Giving L$ [AMOUNT]</string> + <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string> + <string name="this_costs">This costs L$ [AMOUNT]</string> + <string name="buying_selected_land">Buying selected land for L$ [AMOUNT]</string> + <string name="this_object_costs">This object costs L$ [AMOUNT]</string> + + <string name="group_role_everyone">Everyone</string> + <string name="group_role_officers">Officers</string> + <string name="group_role_owners">Owners</string> + <string name="group_member_status_online">Online</string> + + <string name="uploading_abuse_report">Uploading... + +Abuse Report</string> + + <!-- names for new inventory items--> + <string name="New Shape">New Shape</string> + <string name="New Skin">New Skin</string> + <string name="New Hair">New Hair</string> + <string name="New Eyes">New Eyes</string> + <string name="New Shirt">New Shirt</string> + <string name="New Pants">New Pants</string> + <string name="New Shoes">New Shoes</string> + <string name="New Socks">New Socks</string> + <string name="New Jacket">New Jacket</string> + <string name="New Gloves">New Gloves</string> + <string name="New Undershirt">New Undershirt</string> + <string name="New Underpants">New Underpants</string> + <string name="New Skirt">New Skirt</string> + <string name="New Alpha">New Alpha</string> + <string name="New Tattoo">New Tattoo</string> + <string name="Invalid Wearable">Invalid Wearable</string> + <string name="New Gesture">New Gesture</string> + <string name="New Script">New Script</string> + <string name="New Note">New Note</string> + <string name="New Folder">New Folder</string> + <string name="Contents">Contents</string> + <string name="Gesture">Gesture</string> + <string name="Male Gestures">Male Gestures</string> + <string name="Female Gestures">Female Gestures</string> + <string name="Other Gestures">Other Gestures</string> + <string name="Speech Gestures">Speech Gestures</string> + <string name="Common Gestures">Common Gestures</string> + <!-- gestures --> + <string name="Male - Excuse me">Male - Excuse me</string> + <string name="Male - Get lost">Male - Get lost</string> + <string name="Male - Blow kiss">Male - Blow kiss</string> + <string name="Male - Boo">Male - Boo</string> + <string name="Male - Bored">Male - Bored</string> + <string name="Male - Hey">Male - Hey</string> + <string name="Male - Laugh">Male - Laugh</string> + <string name="Male - Repulsed">Male - Repulsed</string> + <string name="Male - Shrug">Male - Shrug</string> + <string name="Male - Stick tougue out">Male - Stick tougue out</string> + <string name="Male - Wow">Male - Wow</string> + + <string name="Female - Chuckle">Female - Chuckle</string> + <string name="Female - Cry">Female - Cry</string> + <string name="Female - Embarrassed">Female - Embarrassed</string> + <string name="Female - Excuse me">Female - Excuse me</string> + <string name="Female - Get lost">Female - Get lost</string> + <string name="Female - Blow kiss">Female - Blow kiss</string> + <string name="Female - Boo">Female - Boo</string> + <string name="Female - Bored">Female - Bored</string> + <string name="Female - Hey">Female - Hey</string> + <string name="Female - Hey baby">Female - Hey baby</string> + <string name="Female - Laugh">Female - Laugh</string> + <string name="Female - Looking good">Female - Looking good</string> + <string name="Female - Over here">Female - Over here</string> + <string name="Female - Please">Female - Please</string> + <string name="Female - Repulsed">Female - Repulsed</string> + <string name="Female - Shrug">Female - Shrug</string> + <string name="Female - Stick tougue out">Female - Stick tougue out</string> + <string name="Female - Wow">Female - Wow</string> + + <!-- birth date format shared by avatar inspector and profile panels --> + <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> + + <string name="DefaultMimeType">none/none</string> + <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> + + <!-- language specific white-space characters, delimiters, spacers, item separation symbols --> + <string name="sentences_separator" value=" "></string> + <string name="words_separator" value=", "/> + + <string name="server_is_down"> + Despite our best efforts, something unexpected has gone wrong. + + Please check status.secondlifegrid.net to see if there is a known problem with the service. + If you continue to experience problems, please check your network and firewall setup. + </string> + + <!-- overriding datetime formating. + didn't translate if this is not needed for current localization + --> + <string name="dateTimeWeekdaysNames">Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday</string> + <string name="dateTimeWeekdaysShortNames">Sun:Mon:Tue:Wed:Thu:Fri:Sat</string> + <string name="dateTimeMonthNames">January:February:March:April:May:June:July:August:September:October:November:December</string> + <string name="dateTimeMonthShortNames">Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec</string> + <string name="dateTimeDayFormat">[MDAY]</string> + <string name="dateTimeAM">AM</string> + <string name="dateTimePM">PM</string> + + <!-- currency formatting --> + <string name="LocalEstimateUSD">US$ [AMOUNT]</string> + + <!-- Group Profile roles and powers --> + <string name="Membership">Membership</string> + <string name="Roles">Roles</string> + <string name="Group Identity">Group Identity</string> + <string name="Parcel Management">Parcel Management</string> + <string name="Parcel Identity">Parcel Identity</string> + <string name="Parcel Settings">Parcel Settings</string> + <string name="Parcel Powers">Parcel Powers</string> + <string name="Parcel Access">Parcel Access</string> + <string name="Parcel Content">Parcel Content</string> + <string name="Object Management">Object Management</string> + <string name="Accounting">Accounting</string> + <string name="Notices">Notices</string> + <string name="Chat">Chat</string> + + <!-- Question strings for delete items notifications --> + <string name="DeleteItems">Delete selected items?</string> + <string name="DeleteItem">Delete selected item?</string> + + <string name="EmptyOutfitText">There are no items in this outfit</string> + + </strings> diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index 616dc1a1d4..bae821d3b5 100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -2,21 +2,16 @@ <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> - Problem encountered processing your teleport request. You may -need to log back in before you can teleport. If you continue -to get this message, please check the Tech Support FAQ at: -www.secondlife.com/support + Problem encountered processing your teleport request. You may need to log back in before you can teleport. +If you continue to get this message, please check the [SUPPORT_SITE]. </message> <message name="invalid_region_handoff"> - Problem encountered processing your region crossing. You may -need to log back in before you can cross regions. If you continue -to get this message, please check the Tech Support FAQ at: -www.secondlife.com/support. + Problem encountered processing your region crossing. You may need to log back in before you can cross regions. +If you continue to get this message, please check the [SUPPORT_SITE]. </message> <message name="blocked_tport"> Sorry, teleport is currently blocked. Try again in a moment. -If you still cannot teleport, please log out and log back in to -resolve the problem. +If you still cannot teleport, please log out and log back in to resolve the problem. </message> <message name="nolandmark_tport"> Sorry, but system was unable to locate landmark destination. @@ -29,27 +24,19 @@ Try again in a moment. Sorry, you do not have access to that teleport destination. </message> <message name="missing_attach_tport"> - Your attachments have not arrived yet. Try waiting for a few -more seconds or log out and back in again before attempting -to teleport. + Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport. </message> <message name="too_many_uploads_tport"> - The asset queue in this region is currently clogged so your teleport -request will not be able to succeed in a timely manner. Please try again -in a few minutes or go to a less busy area. + The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area. </message> <message name="expired_tport"> - Sorry, but the system was unable to complete your teleport request -in a timely fashion. Please try again in a few minutes. + Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes. </message> <message name="expired_region_handoff"> - Sorry, but the system was unable to complete your region crossing -in a timely fashion. Please try again in a few minutes. + Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes. </message> <message name="no_host"> - Unable to find teleport destination. The destination may be -temporarily unavailable or no longer exists. Please try again -in a few minutes. + Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes. </message> <message name="no_inventory_host"> The inventory system is currently unavailable. @@ -74,6 +61,9 @@ in a few minutes. <message name="completing"> Completing teleport. </message> + <message name="completed_from"> + Teleport completed from [T_SLURL] + </message> <message name="resolving"> Resolving destination. </message> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml new file mode 100644 index 0000000000..1a66f0f5c5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<accordion + height="100" + name="accordion" + width="200"> + <!-- It is possible to override attributes of "no_matched_tabs_text" and "no_visible_tabs_text" with a short form: + no_matched_tabs_text.value="Overridden text" (placed among <accordion> attributes) + But unfortunatly such form is not supported by VLT Tool. It requires to have the overridden "value" + attribute declared in tags below ("no_matched_tabs_text" & "no_visible_tabs_text"). + It looks less clean but we have to use "long" form for these messages to enable automated translation with VLT. + --> + <no_matched_tabs_text + follows="all" + height="100" + h_pad="10" + name="no_matched_tabs_msg" + v_pad="15" + width="200" + wrap="true "/> + <!-- This widget will not be created in viewer. Only its value will be used for empty accordion without filter. --> + <no_visible_tabs_text + name="no_visible_tabs_msg" + visible="false"/> +</accordion> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml new file mode 100644 index 0000000000..6f68c99021 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<accordion_tab + header_bg_color="DkGray2" + header_collapse_img="Accordion_ArrowClosed_Off" + header_collapse_img_pressed="Accordion_ArrowClosed_Press" + header_expand_img="Accordion_ArrowOpened_Off" + header_expand_img_pressed="Accordion_ArrowOpened_Press" + header_image="Accordion_Off" + header_image_over="Accordion_Over" + header_image_pressed="Accordion_Press" + header_image_focused="Accordion_Selected" + header_text_color="AccordionHeaderTextColor" + font="SansSerif" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml new file mode 100644 index 0000000000..a35e2c3663 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + +<avatar_icon default_icon_name="Generic_Person_Large"> +</avatar_icon> diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml new file mode 100644 index 0000000000..ed8df69bf4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<avatar_list_item + height="0" + layout="topleft" + left="0" + name="avatar_list_item" + top="0" + width="0"> + <!-- DEFAULT styles for avatar item --> + <default_style + font="SansSerifSmall" + font.style="NORMAL" + color="DkGray"/> + + <!-- styles for avatar item INVITED to voice call --> + <voice_call_invited_style + font="SansSerifSmall" + font.style="NORMAL" + color="0.5 0.5 0.5 0.5"/> + + <!-- styles for avatar item JOINED to voice call --> + <voice_call_joined_style + font="SansSerifSmall" + font.style="NORMAL" + color="white"/> + + <!-- styles for avatar item which HAS LEFT voice call --> + <voice_call_left_style + font="SansSerifSmall" + font.style="ITALIC" + color="LtGray_50"/> + + <!-- styles for ONLINE avatar item --> + <online_style + font="SansSerifSmall" + font.style="NORMAL" + color="white"/> + + <!-- styles for OFFLINE avatar item --> + <offline_style + font="SansSerifSmall" + font.style="NORMAL" + color="0.5 0.5 0.5 1.0"/> +</avatar_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml new file mode 100644 index 0000000000..0eec002006 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<bodyparts_list_item + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="wearable_item" + bottom="0" + width="380"> + <item_icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="0" + name="item_icon" + top="2" + width="16" /> + <item_name + follows="left|right" + height="16" + layout="topleft" + left="21" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> + <lock_panel + background_visible="false" + name="btn_lock" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="You don't have permission to edit"/> + <lock_icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + <edit_panel + background_visible="false" + name="btn_edit_panel" + layout="topleft" + follows="top|right" + top="1" + left="17" + height="23" + width="26" + tab_stop="false"/> + <edit_btn + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Edit this shape"/> +</bodyparts_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index a1e074fae2..2d0a1728d5 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<button image_unselected="button_enabled_32x128.tga" - image_selected="button_enabled_selected_32x128.tga" - image_disabled_selected="button_disabled_32x128.tga" - image_disabled="button_disabled_32x128.tga" +<!-- Additional attributes: + image_pressed + image_pressed_selected + image_flash + --> +<button image_unselected="PushButton_Off" + image_selected="PushButton_Selected" + image_disabled_selected="PushButton_Selected_Disabled" + image_disabled="PushButton_Disabled" + image_top_pad="0" + image_bottom_pad="0" + imgoverlay_label_space="1" label_color="ButtonLabelColor" label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" @@ -11,7 +19,10 @@ image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" + font="SansSerifSmall" hover_glow_amount="0.15" halign="center" + pad_bottom="3" + height="23" scale_image="true"> </button> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml new file mode 100644 index 0000000000..ef885e8045 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -0,0 +1,24 @@ +<?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="1" + bottom_separator_pad="1" + 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>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml index ff01dcebd8..7a60bee338 100644 --- a/indra/newview/skins/default/xui/en/widgets/check_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<check_box text_enabled_color="LabelTextColor" - text_disabled_color="LabelDisabledColor" - font="SansSerifSmall" +<check_box font="SansSerifSmall" follows="left|top"> - <check_box.label_text name="checkbox label"/> + <check_box.label_text name="checkbox label" + text_color="LabelTextColor" + text_readonly_color="LabelDisabledColor"/> <check_box.check_button name="CheckboxCtrl Button" - commit_on_return="false" + commit_on_return="false" label="" is_toggle="true" - hover_glow_amount="0.35" font="SansSerif" scale_image="false" - image_unselected="checkbox_enabled_false.tga" - image_selected="checkbox_enabled_true.tga" - image_disabled="checkbox_disabled_false.tga" - image_disabled_selected="checkbox_disabled_true.tga"/> + image_unselected="Checkbox_Off" + image_selected="Checkbox_On" + image_disabled="Checkbox_Off_Disabled" + image_disabled_selected="Checkbox_On_Disabled" + image_pressed="Checkbox_Press" + image_pressed_selected="Checkbox_On_Press" /> </check_box> 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 new file mode 100644 index 0000000000..413ca1d1ef --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_im_adhoc + height="23" + name="im_adhoc_chiclet" + show_speaker="false" + width="25"> + <chiclet_im_adhoc.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> + <chiclet_im_adhoc.speaker + auto_update="true" + draw_border="false" + height="23" + left="25" + name="speaker" + visible="false" + width="20" /> + <chiclet_im_adhoc.avatar_icon + bottom="3" + follows="left|top|bottom" + height="20" + left="2" + mouse_opaque="false" + name="adhoc_icon" + width="21" /> + <chiclet_im_adhoc.unread_notifications + halign="center" + height="23" + left="25" + mouse_opaque="false" + name="unread" + text_color="white" + v_pad="3" + visible="false" + width="20" /> + <chiclet_im_adhoc.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</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 new file mode 100644 index 0000000000..372a89cbc7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_im_group + height="23" + name="im_group_chiclet" + show_speaker="false" + width="25"> + <chiclet_im_group.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> + <chiclet_im_group.speaker + auto_update="true" + draw_border="false" + height="25" + left="25" + name="speaker" + visible="false" + width="20" /> + <chiclet_im_group.group_icon + bottom="3" + default_icon="Generic_Group" + follows="left|top|bottom" + height="20" + left="2" + mouse_opaque="false" + name="group_icon" + width="21" /> + <chiclet_im_group.unread_notifications + height="23" + halign="center" + left="25" + mouse_opaque="false" + name="unread" + text_color="white" + v_pad="3" + visible="false" + width="20"/> + <chiclet_im_group.new_message_icon +bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</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 new file mode 100644 index 0000000000..99807d4717 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_im_p2p + height="23" + name="im_p2p_chiclet" + show_speaker="false" + width="25"> + <chiclet_im_p2p.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> + <chiclet_im_p2p.speaker + auto_update="true" + draw_border="false" + height="23" + left="25" + name="speaker" + visible="false" + width="20" /> + <chiclet_im_p2p.avatar_icon + bottom="3" + follows="left|top|bottom" + height="20" + left="2" + mouse_opaque="false" + name="avatar_icon" + width="21" /> + <chiclet_im_p2p.unread_notifications + height="23" + halign="center" + left="25" + mouse_opaque="false" + name="unread" + text_color="white" + v_pad="3" + visible="false" + width="20"/> + <chiclet_im_p2p.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</chiclet_im_p2p> diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml new file mode 100644 index 0000000000..4bc295f747 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_offer + height="23" + name="offer_chiclet" + width="25"> + <chiclet_offer.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25" /> + <chiclet_offer.icon + bottom="3" + default_icon="Generic_Object_Small" + follows="all" + height="20" + left="2" + mouse_opaque="false" + name="chiclet_icon" + width="21" /> + <chiclet_offer.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</chiclet_offer>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml new file mode 100644 index 0000000000..5f51f4afd9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_panel + name="chiclet_panel" + chiclet_padding="3" + scrolling_offset="40" + scroll_button_hpad="0" + scroll_ratio="10" + min_width="180" + />
\ 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 new file mode 100644 index 0000000000..db6a9434df --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chiclet_script + height="23" + name="script_chiclet" + width="25"> + <chiclet_script.chiclet_button + height="25" + image_selected="PushButton_On" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> + <chiclet_script.icon + bottom="3" + follows="all" + height="18" + image_name="Generic_Object_Small" + left="2" + mouse_opaque="false" + name="chiclet_icon" + width="21"/> + <chiclet_script.new_message_icon + bottom="11" + height="14" + image_name="Unread_Chiclet" + left="12" + name="new_message_icon" + visible="false" + width="14" /> +</chiclet_script>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml new file mode 100644 index 0000000000..96d72c78a6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<clothing_list_item + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="wearable_item" + bottom="0" + width="380"> + <lock_icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="21" + name="item_icon" + top="2" + width="16" /> + <item_name + follows="left|right" + height="16" + layout="topleft" + left="42" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> + <up_btn + name="btn_move_up" + layout="topleft" + follows="top|right" + image_overlay="UpArrow_Off" + top="1" + left="0" + height="23" + width="23" + tab_stop="false" /> + <down_btn + name="btn_move_down" + layout="topleft" + follows="top|right" + image_overlay="DownArrow_Off" + top="1" + left="26" + height="23" + width="23" + tab_stop="false" /> + <lock_panel + background_visible="false" + name="btn_lock" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="You don't have permission to edit"/> + <lock_icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + <edit_panel + background_visible="false" + name="btn_edit_panel" + layout="topleft" + follows="top|right" + top="0" + left="26" + height="23" + width="26" + tab_stop="false"/> + <edit_btn + name="btn_edit" + layout="topleft" + follows="top|right" + image_overlay="Edit_Wrench" + top="1" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Edit this wearable"/> +</clothing_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml index 304eda2d97..48b987d7e8 100644 --- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml +++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <color_swatch alpha_background_image="color_swatch_alpha.tga" - border_color="DefaultHighlightLight" + border_color="ColorSwatchBorderColor" name="color_swatch"> <color_swatch.caption_text name="caption" - font="SansSerifSmall" - follows="left|right|bottom"/> - <color_swatch.border name="border" - bevel_type="in"/> + halign="center" + follows="left|right|bottom" + v_pad="2"/> </color_swatch> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 8a8f3f7f2c..d1f68a9ef9 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -1,22 +1,34 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <combo_box font="SansSerifSmall" - arrow_image="combobox_arrow.tga" - list_position="below" - max_chars="20" - follows="left|top"> + list_position="below" + max_chars="20" + height="23" + follows="right|top"> <combo_box.combo_button name="Combobox Button" hover_glow_amount="0.15" font="SansSerifSmall" - halign="left" - scale_image="true" - image_unselected="square_btn_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_overlay="combobox_arrow.tga" - image_overlay_alignment="right"/> - <combo_box.combo_list bg_writeable_color="white"/> + scale_image="false" + image_unselected="ComboButton_Off" + image_selected="ComboButton_Selected" + image_disabled="ComboButton_Disabled" /> + <combo_box.drop_down_button name="Drop Down Button" + hover_glow_amount="0.15" + font="SansSerifSmall" + scale_image="true" + pad_right="24" + image_unselected="DropDown_Off" + image_selected="DropDown_On" + image_pressed="DropDown_Press" + image_pressed_selected="DropDown_Press" + image_disabled="DropDown_Disabled" /> + <combo_box.combo_list bg_writeable_color="ComboListBgColor" + background_visible="true" + /> + <!-- Text is "tentative" if you have typed in a string that does not match + any item in the list, but we usually don't care, so use the same color + as normal text. --> <combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" - font="SansSerifSmall"/> + font="SansSerifSmall" + text_tentative_color="TextFgColor" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml new file mode 100644 index 0000000000..459706c689 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu visible="false"/> diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml new file mode 100644 index 0000000000..0534485ddd --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<deletable_wearable_list_item + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="deletable_wearable_item" + bottom="0" + width="380"> + <delete_btn + name="btn_delete" + layout="topleft" + follows="top|left" + image_unselected="Toast_CloseBtn" + image_selected="Toast_CloseBtn" + top="3" + left="0" + height="18" + width="18" + tab_stop="false" + tool_tip="Remove from outfit"/> + <item_icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="24" + name="item_icon" + top="2" + width="16" /> + <item_name + follows="left|right" + height="16" + layout="topleft" + left="45" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="5" + value="..." + width="359" /> +</deletable_wearable_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml index c35d15ec92..602250ace6 100644 --- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml +++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml @@ -2,19 +2,19 @@ <drop_down text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" font="SansSerifSmall" - allow_text_entry="false" + allow_text_entry="false" follows="left|top"> <drop_down.combo_button name="Combobox Button" hover_glow_amount="0.15" font="SansSerifSmall" halign="left" scale_image="true" - image_unselected="square_btn_32x128.tga" - image_selected="square_btn_selected_32x128.tga" - image_disabled="square_btn_32x128.tga" - image_disabled_selected="square_btn_selected_32x128.tga" - image_overlay="combobox_arrow.tga" - image_overlay_alignment="right"/> - <drop_down.combo_list bg_writeable_color="white"/> - <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true"/> + image_unselected="PushButton_Off" + image_selected="PushButton_Selected" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled_Selected" + image_overlay="Combobox_Over" + image_overlay_alignment="right" /> + <drop_down.combo_list bg_writeable_color="white" /> + <drop_down.combo_editor name="Combo Text Entry" visible="false" select_on_focus="true" /> </drop_down> diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml new file mode 100644 index 0000000000..6c60624805 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<dummy_clothing_list_item + follows="top|right|left" + height="23" + layout="topleft" + left="0" + name="dummy_clothing_item" + bottom="0" + width="380"> + <item_icon + height="16" + color="0.75 0.75 0.75 1" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="20" + name="item_icon" + top="2" + width="16" /> + <item_name + follows="left|right" + height="16" + layout="topleft" + left="41" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="LtGray_50" + top="4" + value="..." + width="359" /> + <add_panel + name="btn_add_panel" + layout="topleft" + follows="top|right" + top="0" + left="0" + height="23" + width="26" + tab_stop="false"/> + <add_btn + name="btn_add" + layout="topleft" + follows="top|right" + image_overlay="AddItem_Off" + top="0" + left="0" + height="23" + width="23" + tab_stop="false" + tool_tip="Add more items of this type" /> +</dummy_clothing_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml new file mode 100644 index 0000000000..c6331ec87b --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<expandable_text + max_height="300" > + <textbox + parse_urls="true" + allow_scroll="true" + bg_visible="false" + follows="left|top|right" + name="text" + read_only="true" + use_ellipses="true" + word_wrap="true" + show_context_menu="true" + tab_stop="true" + v_pad="3" + h_pad="4" > + </textbox> + <scroll + name="scroll" + follows="all" + /> +</expandable_text> diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml new file mode 100644 index 0000000000..0720621f0b --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<filter_editor + clear_button_visible="true" + search_button_visible="false" + text_pad_left="7" + select_on_focus="true" + text_tentative_color="TextFgTentativeColor" + background_image="TextField_Search_Off" + background_image_disabled="TextField_Search_Disabled" + background_image_focused="TextField_Search_Active"> + <search_button label="" + top_pad="4" + left_pad="4" + width="13" + height="13" + image_unselected="Search" + image_selected="Search" /> + <clear_button label="" + image_unselected="Icon_Close_Toast" + image_selected="Icon_Close_Toast" /> +</filter_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml new file mode 100644 index 0000000000..e05ddf9815 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<flat_list_view + allow_select="true" + color="PanelFocusBackgroundColor" + item_pad="0" + keep_one_selected="true" + multi_select="false" + opaque="true"> + <flat_list_view.no_items_text + follows="all" + name="no_items_msg" + v_pad="10" + h_pad="10" + value="No matches found" + wrap="true" /> +</flat_list_view>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml new file mode 100644 index 0000000000..85d0c633af --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- See also settings.xml UIFloater* settings for configuration --> +<floater + name="floater" + bg_opaque_color="FloaterFocusBackgroundColor" + bg_alpha_color="FloaterDefaultBackgroundColor" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" + background_visible="true" + background_opaque="false" + header_height="25" + close_image="Icon_Close_Foreground" + restore_image="Icon_Restore_Foreground" + minimize_image="Icon_Minimize_Foreground" + tear_off_image="tearoffbox.tga" + dock_image="Icon_Dock_Foreground" + help_image="Icon_Help_Foreground" + close_pressed_image="Icon_Close_Press" + restore_pressed_image="Icon_Restore_Press" + minimize_pressed_image="Icon_Minimize_Press" + tear_off_pressed_image="tearoff_pressed.tga" + dock_pressed_image="Icon_Dock_Press" + help_pressed_image="Icon_Help_Press" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml index e0033058c8..83df10e417 100644 --- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<flyout_button list_position="below"> +<flyout_button list_position="below" height="23"> <action_button scale_image="true" - image_selected="flyout_btn_left_selected.tga" - image_unselected="flyout_btn_left.tga" - image_disabled="flyout_btn_left_disabled.tga"/> - <combo_button image_selected="flyout_btn_right_selected.tga" - image_unselected="flyout_btn_right.tga" - image_disabled="flyout_btn_right_disabled.tga" + image_selected="SegmentedBtn_Left_Selected" + image_unselected="SegmentedBtn_Left_Off" + image_disabled="SegmentedBtn_Left_Disabled"/> + <combo_button image_selected="ComboButton_Selected" + image_unselected="ComboButton_Off" + image_disabled="ComboButton_Disabled" pad_right="6" tab_stop="false"/> -</flyout_button> - +</flyout_button>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml new file mode 100644 index 0000000000..e6bdcccfdf --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<folder_view_item + folder_arrow_image="Folder_Arrow" + folder_indentation="8" + item_height="20" + item_top_pad="4" + selection_image="Rounded_Square" + /> 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/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml new file mode 100644 index 0000000000..58d5e19fcc --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<group_icon + default_icon_name="Generic_Group" + image_name="Generic_Group" + name="group_icon" /> diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml new file mode 100644 index 0000000000..92080df154 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<hint_popup + name="hint" + background_opaque="true" + background_visible="true" + chrome="true" + layout="topleft" + bg_opaque_image="hint_background" + distance="24" + left_arrow="hint_arrow_left" + up_arrow="hint_arrow_up" + right_arrow="hint_arrow_right" + down_arrow="hint_arrow_down" + lower_left_arrow="hint_arrow_lower_left" + left_arrow_offset="3" + up_arrow_offset="-2" + right_arrow_offset="-3" + down_arrow_offset="5" + fade_in_time="0.2" + fade_out_time="0.3"> +</hint_popup> diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml new file mode 100644 index 0000000000..428b2ce03b --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inspector name="inspector" + bg_opaque_color="DkGray_66" + background_visible="true" + bg_opaque_image="Inspector_Hover" + background_opaque="true" + bg_alpha_image="none" + mouse_opaque="true" + text_color="InspectorTipTextColor"/> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml new file mode 100644 index 0000000000..da9059c819 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<inventory_list_item + follows="top|right|left" + height="20" + name="inventory_item" + tab_stop="false" + hover_image="ListItem_Over" + selected_image="ListItem_Select" + separator_image="Wearables_Divider" + width="380"> + <!-- DEFAULT style for inventory list item --> + <default_style + font="SansSerifSmall" + font.style="NORMAL" /> + + <!-- style for inventory list item WORN on avatar --> + <worn_style + font="SansSerifSmall" + font.style="BOLD" + color="EmphasisColor" /> + <item_icon + height="16" + follows="top|left" + image_name="Inv_Object" + layout="topleft" + left="0" + name="item_icon" + top="0" + width="16" /> + <item_name + follows="left|right" + height="20" + layout="topleft" + left="21" + parse_urls="false" + use_ellipses="true" + name="item_name" + text_color="white" + top="4" + value="..." + width="359" /> +</inventory_list_item> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml new file mode 100644 index 0000000000..93875d66e6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bg_opaque_color="InventoryBackgroundColor" + background_visible="true" + background_opaque="true" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 11081ae308..a054960bf8 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<line_editor background_image="sm_rounded_corners_simple.tga" +<line_editor background_image="TextField_Off" + background_image_disabled="TextField_Disabled" + background_image_focused="TextField_Active" select_on_focus="false" - handle_edit_keys_directly="false" commit_on_focus_lost="true" ignore_tab="true" cursor_color="TextCursorColor" text_color="TextFgColor" + text_pad_left="2" text_readonly_color="TextFgReadOnlyColor" text_tentative_color="TextFgTentativeColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" + highlight_color="EmphasisColor" + preedit_bg_color="White" mouse_opaque="true" name="line_editor" font="SansSerifSmall"> - <line_editor.border bevel_style="in"/> </line_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml new file mode 100644 index 0000000000..2e976bc755 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<list_view + fg_selected_color="ListViewSelectedFgColor" + bg_selected_color="ListViewSelectedBgColor" + bg_color="ListViewBgColor" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml new file mode 100644 index 0000000000..6040d24128 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<loading_indicator + follows="left|top" + mouse_opaque="false" + name="loading_indicator" + rotations_per_sec="1.0" + tab_stop="false" +/> 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 32f5a18d1c..37d60f1671 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -4,63 +4,138 @@ Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images. --> <location_input font="SansSerifSmall" - add_landmark_image_enabled="icon_event_adult.tga" - add_landmark_image_disabled="icon_event.tga" - add_landmark_hpad="4" - allow_text_entry="true" - arrow_image="combobox_arrow.tga" - list_position="below" - show_text_as_tentative="false" - max_chars="20" - follows="left|top"> - <location_input.background name="Background" - visible="true" - label="" - follows="left|top|right" - image_unselected="navbar_bg_center.tga" - image_selected="navbar_bg_center.tga" - image_disabled="navbar_bg_center.tga" - image_disabled_selected="navbar_bg_center.tga" - image_hover_selected="navbar_bg_center.tga" - image_hover_unselected="navbar_bg_center.tga" /> - <location_input.info_button name="Place Information" - label="" - tool_tip="About current location" - width="20" - height="20" + icon_maturity_general="Parcel_PG_Light" + icon_maturity_adult="Parcel_R_Light" + icon_maturity_moderate="Parcel_M_Light" + maturity_help_topic="maturity_rating" + add_landmark_image_enabled="Favorite_Star_Active" + add_landmark_image_disabled="Favorite_Star_Off" + add_landmark_image_hover="Favorite_Star_Over" + add_landmark_image_selected="Favorite_Star_Press" + add_landmark_hpad="12" + icon_hpad="2" + allow_text_entry="true" + list_position="below" + show_text_as_tentative="false" + max_chars="20" + follows="left|top" + allow_new_values="true" + > + <!-- *NOTE: Tooltips are in strings.xml so they can be localized. + See LocationCtrlAddLandmarkTooltip etc. --> + <info_button + name="Place Information" + width="16" + height="16" + left="6" + top="20" follows="left|top" - image_overlay="map_infohub.tga" - image_unselected="navbar_bg_left.tga" - image_selected="navbar_bg_left.tga" - image_hover_selected="navbar_bg_left.tga" - image_hover_unselected="navbar_bg_left.tga" - image_disabled_selected="navbar_bg_left.tga" - image_disabled="navbar_bg_left.tga" /> - <location_input.add_landmark_button name="Add Landmark" - label="" - width="16" - height="16" - tool_tip="Add to My Landmarks" + hover_glow_amount="0.15" + image_unselected="Info_Off" + image_selected="Info_Off" + image_disabled_selected="Info_Off" + image_disabled="Info_Off" /> + <add_landmark_button name="Add Landmark" + hover_glow_amount="0.15" + image_hover_selected="Favorite_Star_Over" + image_hover_unselected="Favorite_Star_Over" + width="18" + height="18" follows="right|top" - scale_image="false" /> - <location_input.combo_button name="Location History" - label="" - tool_tip="My Location History" - width="20" - height="20" - image_overlay="navbar_history.tga" - image_overlay_alignment="center" - image_unselected="navbar_bg_right.tga" - image_selected="navbar_bg_right.tga" - image_disabled="navbar_bg_right.tga" - image_disabled_selected="navbar_bg_right.tga" - image_hover_selected="navbar_bg_right.tga" - image_hover_unselected="navbar_bg_right.tga" /> - <location_input.combo_list bg_writeable_color="white"/> - <location_input.combo_editor name="Combo Text Entry" - select_on_focus="true" - font="SansSerifSmall" - bevel_style="none" - border_style="line" - border_thickness="0" /> + scale_image="false" + top="19" + left="-3" /> + <maturity_button + name="maturity_icon" + width="18" + height="16" + top="20" + follows="left|top" + /> + <for_sale_button + name="for_sale_btn" + image_unselected="Parcel_ForSale_Light" + image_selected="Parcel_ForSale_Light" + width="22" + height="18" + follows="right|top" + scale_image="false" + top="21" + /> + <voice_icon + enabled="true" + name="voice_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_VoiceNo_Light" + /> + <fly_icon + name="fly_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_FlyNo_Light" + /> + <push_icon + name="push_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_PushNo_Light" + /> + <build_icon + name="build_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_BuildNo_Light" + /> + <scripts_icon + name="scripts_icon" + width="22" + height="18" + top="21" + follows="right|top" + image_name="Parcel_ScriptsNo_Light" + /> + <damage_icon + name="damage_icon" + width="14" + height="13" + top="19" + left="2" + follows="right|top" + image_name="Parcel_Health_Dark" + /> + <!-- Default text color is invisible on top of nav bar background --> + <damage_text + name="damage_text" + width="35" + height="18" + top="17" + follows="right|top" + halign="right" + font="SansSerifSmall" + text_color="TextFgColor" + /> + <combo_button + name="Location History" + label="" + pad_right="0"/> + <combo_list + bg_writeable_color="MenuDefaultBgColor" + page_lines="10" + scroll_bar_bg_visible="true" /> + <combo_editor name="Combo Text Entry" + text_pad_left="27" + select_on_focus="false" + font="SansSerifSmall" + bevel_style="none" + border_style="line" + 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 10bc124ea3..58543338f6 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml @@ -2,5 +2,6 @@ <menu bg_color="MenuDefaultBgColor" bg_visible="true" drop_shadow="true" - tear_off="false"> + tear_off="false" + shortcut_pad="15"> </menu> diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml new file mode 100644 index 0000000000..563f3dc5c2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Use this for the top-level menu styling --> +<menu_item font="SansSerifSmall" /> diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml new file mode 100644 index 0000000000..185ed6ee3e --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Use "disabled color" to make it look like menu separators --> +<menu_item_tear_off enabled_color="MenuItemDisabledColor" + disabled_color="MenuItemDisabledColor" + highlight_bg_color="MenuItemHighlightBgColor" + highlight_fg_color="MenuItemHighlightFgColor"> +</menu_item_tear_off> diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml new file mode 100644 index 0000000000..9d71ceca2f --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<output_monitor + draw_border="true" + follows="top|left" + image_mute="Parcel_VoiceNo_Light" + image_off="VoicePTT_Off" + image_on="VoicePTT_On" + image_level_1="VoicePTT_Lvl1" + image_level_2="VoicePTT_Lvl2" + image_level_3="VoicePTT_Lvl3" + mouse_opaque="false" + name="output_monitor" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index b81a70b845..9bf99fa363 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Optional parameters: + border - show border around panel + bg_opaque_image - image name for "in-front" panel look + bg_alpha_image - image name for "in-back" or transparent panel look +--> <panel bg_opaque_color="PanelFocusBackgroundColor" bg_alpha_color="PanelDefaultBackgroundColor" + bg_opaque_image_overlay="White" + bg_alpha_image_overlay="White" background_visible="false" - background_opaque="false"/>
\ No newline at end of file + background_opaque="false" + chrome="false"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml new file mode 100644 index 0000000000..98707b8495 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel_camera_item + background_visible="false" + height="30" + layout="topleft" + width="212"> + <panel_camera_item.icon_over + follows="top|left" + height="30" + image_name="ListItem_Over" + left="0" + mouse_opaque="false" + layout="topleft" + name="hovered_icon" + top="30" + scale_image="true" + visible="false" + width="212" /> + <panel_camera_item.icon_selected + follows="top|left" + height="30" + image_name="ListItem_Select" + layout="topleft" + left="0" + mouse_opaque="false" + name="selected_icon" + top="30" + scale_image="true" + visible="false" + width="212" /> + <panel_camera_item.picture + follows="top|left" + height="30" + image_name="Icon_For_Sale" + layout="topleft" + left="0" + mouse_opaque="false" + name="picture" + tab_stop="false" + top="30" + top_pad="10" + width="30" /> + <panel_camera_item.selected_picture + follows="top|left" + height="30" + image_name="Cam_Rotate_In" + layout="topleft" + left="0" + mouse_opaque="false" + name="selected_picture" + tab_stop="false" + top="30" + top_pad="8" + visible="false" + width="30" /> + <panel_camera_item.text + follows="top|left|right" + font="SansSerifMedium" + height="15" + layout="topleft" + left ="38" + name="picture_name" + text_color="white" + top="21" + use_ellipses="true" + width="170" + word_wrap="false" > + Text + </panel_camera_item.text> +</panel_camera_item> diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml index 3344de06b0..339e53fbb8 100644 --- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml @@ -1,19 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<progress_bar image_bar="rounded_square.tga" - image_fill="progressbar_fill.tga" - image_shadow="rounded_square_soft.tga" +<progress_bar image_bar="ProgressTrack" + image_fill="ProgressBar" color_bar.red="0.5764" color_bar.green="0.6627" color_bar.blue="0.8352" color_bar.alpha="1" - color_bar2.red="0.5764" - color_bar2.green="0.6627" - color_bar2.blue="0.8352" - color_bar2.alpha="1" - color_shadow.red="0.2000" - color_shadow.green="0.2000" - color_shadow.blue="0.4000" - color_shadow="1" color_bg.red="0.3254" color_bg.green="0.4000" color_bg.blue="0.5058" diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml index 2d851042a5..ad7ef5bffc 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<radio_group draw_border="true" +<radio_group draw_border="false" name="radio_group" - mouse_opaque="true" + mouse_opaque="false" follows="left|top" font="SansSerifSmall"/> diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml index 0a27ca509b..3ddf18b2cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<radio_item follows="left|top"> +<radio_item follows="left|top" font="SansSerif"> <radio_item.label_text name="Radio Item label"/> <radio_item.check_button name="Radio control button" - image_unselected="radio_active_false.tga" - image_selected="radio_active_true.tga" - image_disabled="radio_inactive_false.tga" - image_disabled_selected="radio_inactive_true.tga"/> + image_unselected="RadioButton_Off" + image_selected="RadioButton_On" + image_disabled="RadioButton_Disabled" + image_disabled_selected="RadioButton_On_Disabled" + image_pressed="RadioButton_Press" + image_pressed_selected="RadioButton_On_Press"/> </radio_item> + diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml index a6c9a56dfd..830ea12e41 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml @@ -1,19 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<scroll_bar thumb_image="rounded_square.tga" - track_image="rounded_square.tga" - track_color="ScrollbarTrackColor" +<scroll_bar thumb_image_vertical ="ScrollThumb_Vert" + thumb_image_horizontal ="ScrollThumb_Horiz" + track_image_vertical ="ScrollTrack_Vert" + track_image_horizontal ="ScrollTrack_Horiz" + track_color="ScrollbarTrackColor" thumb_color="ScrollbarThumbColor" - thickness="16"> - <up_button image_unselected="scrollbutton_up_out_blue.tga" - image_selected="scrollbutton_up_in_blue.tga" - scale_image="true"/> - <down_button image_unselected="scrollbutton_down_out_blue.tga" - image_selected="scrollbutton_down_in_blue.tga" - scale_image="true"/> - <left_button image_unselected="scrollbutton_left_out_blue.tga" - image_selected="scrollbutton_left_in_blue.tga" - scale_image="true"/> - <right_button image_unselected="scrollbutton_right_out_blue.tga" - image_selected="scrollbutton_right_in_blue.tga" - scale_image="true"/> + thickness="15"> + <up_button image_unselected="ScrollArrow_Up" + image_selected="ScrollArrow_Up" + scale_image="true" + hover_glow_amount="0.35"/> + <down_button image_unselected="ScrollArrow_Down" + image_selected="ScrollArrow_Down" + scale_image="true" + hover_glow_amount="0.35"/> + <left_button image_unselected="ScrollArrow_Left" + image_selected="ScrollArrow_Left" + scale_image="true" + hover_glow_amount="0.35"/> + <right_button image_unselected="ScrollArrow_Right" + image_selected="ScrollArrow_Right" + scale_image="true" + hover_glow_amount="0.35"/> </scroll_bar> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml new file mode 100644 index 0000000000..f936a1e208 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<scroll_column_header + image_unselected="SegmentedBtn_Middle_Selected" + image_selected="SegmentedBtn_Middle_Selected" + image_pressed="SegmentedBtn_Middle_Selected_Press" + image_disabled="SegmentedBtn_Middle_Disabled" + image_disabled_selected="SegmentedBtn_Middle_Selected_Disabled" + image_overlay="DisclosureArrow_Opened_Off" + image_overlay_alignment="right" + halign="left" + scale_image="true" /> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml index cb9ef04797..86356ff563 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml @@ -1,3 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <scroll_container color="black" - opaque="false"/> + opaque="false" + min_auto_scroll_rate="120" + max_auto_scroll_rate="500"/> diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index 9e2c52acca..dd93675807 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -4,13 +4,18 @@ bg_selected_color="ScrollSelectedBGColor" fg_disable_color="ScrollDisabledColor" bg_writeable_color="ScrollBgWriteableColor" - bg_read_only_color="ScrollBgReadOnlyColor" + bg_readonly_color="ScrollBgReadOnlyColor" bg_stripe_color="ScrollBGStripeColor" hovered_color="ScrollHoveredColor" highlighted_color="ScrollHighlightedColor" column_padding="5" draw_stripes="true" + scroll_bar_bg_visible="false" + scroll_bar_bg_color="black" + mouse_wheel_opaque="false" background_visible="true" - heading_height="20" - draw_border="true" - draw_heading="false"/> + heading_height="23" + draw_border="false" + draw_heading="false" + border.name="dig border" + border.bevel_style="in" /> diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml new file mode 100644 index 0000000000..ce84cfedc0 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<search_combo_box + allow_text_entry="true" + list_position="below" + show_text_as_tentative="false" + dropdown_button_visible="false" + max_chars="256" + name="parent" + allow_new_values="true"> + <combo_editor + name="child1" + select_on_focus="true" + text_pad_left="30" + text_tentative_color="TextFgTentativeColor" + background_image="TextField_Search_Off" + background_image_disabled="TextField_Search_Disabled" + background_image_focused="TextField_Search_Active"/> + <combo_list + multi_select="false" + name="child2" + page_lines="10" + scroll_bar_bg_visible="true" /> + <search_button label="" + top_pad="5" + left_pad="10" + name="child3" + width="13" + height="13" + image_unselected="Search" + image_selected="Search" /> +</search_combo_box>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index 10080e5e39..32e443a058 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -1,6 +1,27 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<search_editor select_on_focus="true"> - <clear_search_button image_unselected="icn_clear_lineeditor.tga" - image_selected="close_inactive_blue.tga" - image_color="TextFgTentativeColor"/> +<search_editor + clear_button_visible="false" + search_button_visible="true" + text_pad_left="6" + text_pad_right="6" + select_on_focus="true" + text_tentative_color="TextFgTentativeColor" + background_image="TextField_Search_Off" + background_image_disabled="TextField_Search_Disabled" + background_image_focused="TextField_Search_Active" > + <search_button + top_pad="4" + left_pad="4" + width="13" + height="13" + image_unselected="Search" + image_selected="Search" /> + <clear_button + bottom="4" + height="16" + image_unselected="Icon_Close_Foreground" + image_selected="Icon_Close_Press" + pad_right="4" + pad_left="4" + width="16" /> </search_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml index e3b70ba6e2..022564c12f 100644 --- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml +++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
- tab_btn_image_selected="sidebar_tab_left_selected.tga"
- tab_btn_width = "32"
- tab_btn_height = "32"
- tab_btn_margin = "0"
- >
-</side_tray>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<side_tray tab_btn_image="TaskPanel_Tab_Off" + tab_btn_image_selected="TaskPanel_Tab_Selected" + tab_btn_width="32" + tab_btn_height="40" + tab_btn_margin="1"> +</side_tray> diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 20af3bb58f..a120b1aec8 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -1,11 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<simple_text_editor cursor_color="TextCursorColor" - default_color="TextDefaultColor" - text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" - hide_border="false" - hide_scrollbar="false" - font="SansSerif"/> +<simple_text_editor + parse_urls="false" + mouse_opaque="true" + font="SansSerifSmall" + max_length="255" + embedded_items="false" + allow_scroll="true" + border_visible="false" + word_wrap="false" + ignore_tab="true" + line_spacing.pixels="1" + track_bottom="false" + cursor_color="TextCursorColor" + default_color="TextDefaultColor" + text_color="TextFgColor" + text_readonly_color="TextFgReadOnlyColor" + text_selected_color="White" + h_pad="6" + v_pad="4" + bg_visible="true" + bg_readonly_color="TextBgReadOnlyColor" + bg_writeable_color="TextBgWriteableColor" + bg_selected_color="EmphasisColor" + bg_focus_color="TextBgFocusColor"> +</simple_text_editor> diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index ba9ad21cc0..ea63cac790 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -1,7 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. --> <slider_bar track_color="SliderTrackColor" thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" - thumb_image="icn_slide-thumb_dark.tga" - track_image="icn_slide-groove_dark.tga" - track_highlight_image="icn_slide-highlight.tga"/> + thumb_image="SliderThumb_Off" + thumb_image_pressed="SliderThumb_Press" + thumb_image_disabled="SliderThumb_Disabled" + track_image_horizontal="SliderTrack_Horiz" + track_image_vertical="SliderTrack_Vert" + track_highlight_horizontal_image="transparent.j2c" + track_highlight_vertical_image="SliderTrack_Vert" + font="SansSerif" /> diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 29bf1e8052..d7af6077e5 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,5 +1,17 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" - decimal_digits="3" - label_width="40"/>
\ No newline at end of file + font="SansSerifSmall" + decimal_digits="3" + label_width="40" > + <spinner.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <spinner.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</spinner>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml new file mode 100644 index 0000000000..2ff9ada90a --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<split_button + font="SansSerifSmall" + arrow_position="left" + follows="right|top"> + <split_button.items_panel + background_visible="true" + border="true" + bg_alpha_color="1 1 1 1" + bg_opaq_color="1 1 1 1" + scale_image="false" + image_selected="SegmentedBtn_Left_Selected" + image_unselected="SegmentedBtn_Left_Off" + layout="topleft" + name="item_buttons" + /> + <split_button.arrow_button + name="Arrow Button" + label="" + font="SansSerifSmall" + scale_image="false" + image_selected="SegmentedBtn_Right_Selected" + image_unselected="SegmentedBtn_Right_Off" + /> +</split_button> diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 8245e5ff23..c37ead0be2 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -1,9 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- +label_pad_bottom - vertical padding under tab button labels +label_pad_left - padding to the left of tab button labels +--> <tab_container tab_min_width="60" tab_max_width="150" - tab_top_image_unselected="tab_top_blue.tga" - tab_top_image_selected="tab_top_selected_blue.tga" - tab_bottom_image_unselected="tab_bottom_blue.tga" - tab_bottom_image_selected="tab_bottom_selected_blue.tga" - tab_left_image_unselected="tab_left.tga" - tab_left_image_selected="tab_left_selected.tga"/>
\ No newline at end of file + use_custom_icon_ctrl="false" + halign="center" + font="SansSerifSmall" + tab_height="21" + label_pad_bottom="2" + label_pad_left="4"> + <!-- + Possible additional attributes for tabs: + tab_bottom_image_flash + tab_left_image_flash + tab_top_image_flash + --> + <first_tab tab_top_image_unselected="TabTop_Left_Off" + tab_top_image_selected="TabTop_Left_Selected" + tab_bottom_image_unselected="Toolbar_Left_Off" + tab_bottom_image_selected="Toolbar_Left_Selected" + tab_left_image_unselected="SegmentedBtn_Left_Disabled" + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> + <middle_tab tab_top_image_unselected="TabTop_Middle_Off" + tab_top_image_selected="TabTop_Middle_Selected" + tab_bottom_image_unselected="Toolbar_Middle_Off" + tab_bottom_image_selected="Toolbar_Middle_Selected" + tab_left_image_unselected="SegmentedBtn_Left_Disabled" + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> + <last_tab tab_top_image_unselected="TabTop_Right_Off" + tab_top_image_selected="TabTop_Right_Selected" + tab_bottom_image_unselected="Toolbar_Right_Off" + tab_bottom_image_selected="Toolbar_Right_Selected" + tab_left_image_unselected="SegmentedBtn_Left_Disabled" + tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/> +</tab_container> diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml new file mode 100644 index 0000000000..a7e271a1ff --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Derives from LLUICtrl --> +<talk_button> + <!-- To make speak button look green when selected set: + image_selected="SegmentedBtn_Left_Selected" + image_unselected="SegmentedBtn_Left_Off" + --> + <speak_button + follows="left|right" + image_selected="SegmentedBtn_Left_Selected_Press" + image_unselected="SegmentedBtn_Left_Off" + image_pressed="SegmentedBtn_Left_Selected_Press" + image_pressed_selected="SegmentedBtn_Left_Selected_Press" + tab_stop="false" + /> + <show_button + follows="right" + name="speak_flyout_btn" + label="" + left="0" + top="0" + right="20" + bottom="0" + tab_stop="false" + is_toggle="true" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + /> + <monitor + follows="right" + name="monitor" + left="0" + top="18" + right="18" + bottom="0" + /> +</talk_button> diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml new file mode 100644 index 0000000000..4f574d75d5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Menu items for the back button drop-down menu of locations. + Based on menu_item_call.xml --> +<teleport_history_menu_item + back_item_font="SansSerif" + current_item_font="SansSerifBold" + forward_item_font="SansSerif" + /> diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 3d98cd66f9..134f2d7522 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<text name="text_box" +<text parse_urls="true" + mouse_opaque="false" + name="text_box" font="SansSerifSmall" - font_shadow="soft" + font_shadow="none" tab_stop="false" halign="left" - hover_color="LabelSelectedColor" - disabled_color="LabelDisabledColor" - background_color="FloaterDefaultBackgroundColor" - border_color="DefaultHighlightLight" + h_pad="0" + allow_scroll="false" + text_readonly_color="LabelTextColor" + bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" - border_drop_shadow_visible="false" border_visible="false" - hover="false" - text_color="LabelTextColor"/> + sound_flags="0" + text_color="LabelTextColor" + v_pad="0" + max_length="4096"/> diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index dc4c430546..0f7f50b312 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,19 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<line_editor background_image="sm_rounded_corners_simple.tga" - select_on_focus="false" - handle_edit_keys_directly="false" - commit_on_focus_lost="true" - ignore_tab="true" - cursor_color="TextCursorColor" - text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" - text_tentative_color="TextFgTentativeColor" - bg_readonly_color="TextBgReadOnlyColor" - bg_writeable_color="TextBgWriteableColor" - bg_focus_color="TextBgFocusColor" - mouse_opaque="true" - name="line_editor" - font="SansSerifSmall"> - <line_editor.border bevel_style="in" - follows="all"/> -</line_editor> +<!-- Core parameters are in simple_text_editor.xml --> +<text_editor + parse_urls="false" + show_context_menu="true"/> diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml new file mode 100644 index 0000000000..b2da2147c1 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<textbase clip_partial="false" + halign="left" + valign="top" + font="SansSerif"/> diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml index 33c3475eb2..757f0f49d1 100644 --- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml +++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml @@ -3,7 +3,8 @@ <multiselect_text font="SansSerifSmall"/> <caption_text text="Multiple" halign="center" - font="SansSerifSmall"/> + font="SansSerifSmall" + v_pad="2"/> <border bevel_style="in"/> </texture_picker> diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml new file mode 100644 index 0000000000..48950a98ad --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu visible="false"/> diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml new file mode 100644 index 0000000000..9ca15ae50d --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<tool_tip name="tooltip" + max_width="200" + padding="4" + wrap="true" + font="SansSerif" + mouse_opaque="false" + bg_opaque_image="Tooltip" + background_opaque="true" + background_visible="true" + text_color="ToolTipTextColor"/> diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml new file mode 100644 index 0000000000..f4dbb8f404 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Global settings for all widgets ("UI Controls") --> +<!-- The params in this file aren't currently getting loaded in OSX --> +<ui_ctrl + /> |