summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_aaa.xml34
-rw-r--r--indra/newview/skins/default/xui/en/floater_animation_preview.xml24
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml253
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml30
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml17
-rw-r--r--indra/newview/skins/default/xui/en/inspect_group.xml74
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml18
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_chat_header.xml28
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml24
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_security.xml35
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml33
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml13
-rw-r--r--indra/newview/skins/default/xui/en/panel_sys_well_item.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_toast.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/accordion_tab.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/textbase.xml2
20 files changed, 382 insertions, 238 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 0c64408b50..3f86080160 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,10 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- height="768"
+ height="400"
layout="topleft"
name="floater_aaa"
can_resize="true"
- width="1024">
- <string name="Nudge Parabuild">4</string>
- <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
+ width="500">
+ <string name="bump_parabuild">1</string>
+ <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>
+
</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 bb45e51137..a8f875754e 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
can_minimize="false"
- height="556"
+ height="610"
layout="topleft"
name="Animation Preview"
help_topic="animation_preview"
@@ -508,21 +508,21 @@ Maximum animation length is [MAX_LENGTH] seconds.
We recommend BVH files exported from Poser 4.
</text>
<button
- bottom="546"
- follows="bottom|right"
+ top="580"
+ follows="bottom|left"
height="23"
- label="Cancel"
+ label="Upload (L$[AMOUNT])"
layout="topleft"
- name="cancel_btn"
- right="265"
- width="123" />
+ left="10"
+ name="ok_btn"
+ width="128" />
<button
+ top="580"
follows="bottom|left"
height="23"
- label="Upload (L$[AMOUNT])"
+ label="Cancel"
layout="topleft"
- left_delta="-129"
- name="ok_btn"
- top_delta="0"
- width="123" />
+ name="cancel_btn"
+ left="142"
+ width="128" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index dca1692e4a..ff9f0daee6 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -11,7 +11,7 @@
help_topic="inventory"
save_rect="true"
save_visibility="true"
- single_instance="true"
+ single_instance="false"
title="INVENTORY"
width="467">
<floater.string
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 3aeb7c93e7..310ad13dac 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -2,11 +2,11 @@
<floater
legacy_header_height="18"
can_resize="true"
- height="450"
+ height="600"
layout="topleft"
name="floater_test_textbox"
help_topic="floater_test_textbox"
- width="600">
+ width="800">
<text
type="string"
length="1"
@@ -21,128 +21,171 @@ Third line of multiple lines
Fourth line of multiple lines
Fifth line of multiple lines
</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>
- <text
- type="string"
- length="1"
- font="SansSerif"
- font.style="BOLD"
- height="10"
- layout="topleft"
- left_delta="0"
- top_pad="40"
- width="300">
- SansSerif BOLD
- </text>
- <text
- type="string"
- length="1"
- font="SansSerif"
- font.style="BOLD|UNDERLINE"
- height="10"
- layout="topleft"
- left_delta="0"
- top_pad="10"
- width="300">
- SansSerif BOLD UNDERLINE
- </text>
- <text
- type="string"
- length="1"
- bottom="390"
- label="N"
+
+ <text
+ font="SansSerif"
+ font.style="BOLD"
+ height="10"
layout="topleft"
- left="10"
- name="right_aligned_text"
- width="380"
- halign="right"
- top_pad="10">
+ left_delta="0"
+ top_pad="40"
+ 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
- type="string"
- length="1"
bottom="390"
- label="N"
- layout="topleft"
left="10"
name="centered_text"
- width="380"
+ width="300"
halign="center"
top_pad="10">
Centered text
</text>
<text
- type="string"
- length="1"
- height="60"
- label="N"
- layout="topleft"
left="10"
name="left_aligned_text"
- width="380"
+ width="300"
halign="left"
top_pad="10">
Left aligned text
</text>
<text
- type="string"
- length="1"
- bottom="390"
- label="N"
- layout="topleft"
+ 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"
- name="floater_map_north"
- right="30"
- top="370">
- N
+ 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
+ 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_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 636e9d465a..a9b4c1b938 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -303,7 +303,7 @@
name="checkbox snap to grid"
width="134" />
<combo_box
- height="19"
+ height="23"
layout="topleft"
follows="left|top"
name="combobox grid mode"
@@ -2338,16 +2338,16 @@ even though the user gets a free copy.
left="10"
name="tex gen"
top_pad="5"
- width="87">
+ width="85">
Mapping
</text>
<combo_box
- height="22"
+ height="23"
layout="topleft"
left_delta="0"
name="combobox texgen"
top_pad="4"
- width="60">
+ width="85">
<combo_box.item
label="Default"
name="Default"
@@ -2364,18 +2364,18 @@ even though the user gets a free copy.
height="10"
layout="topleft"
name="label shininess"
- left_pad="5"
+ left_pad="4"
top_pad="-36"
- width="60">
+ width="85">
Shininess
</text>
<combo_box
- height="22"
+ height="23"
layout="topleft"
left_delta="0"
name="combobox shininess"
top_pad="4"
- width="60">
+ width="85">
<combo_box.item
label="None"
name="None"
@@ -2399,19 +2399,19 @@ even though the user gets a free copy.
follows="left|top"
height="10"
layout="topleft"
- left_pad="5"
+ left_pad="4"
name="label bumpiness"
top_pad="-36"
- width="87">
+ width="85">
Bumpiness
</text>
<combo_box
- height="22"
+ height="23"
layout="topleft"
left_delta="0"
name="combobox bumpiness"
top_pad="4"
- width="87">
+ width="85">
<combo_box.item
label="None"
name="None"
@@ -2604,7 +2604,7 @@ even though the user gets a free copy.
width="170" />
<button
follows="left|top"
- height="19"
+ height="23"
label="Apply"
label_selected="Apply"
layout="topleft"
@@ -2739,7 +2739,7 @@ even though the user gets a free copy.
decouple_texture_size="true" />
<button
follows="left|top"
- height="19"
+ height="23"
label="Align"
label_selected="Align Media"
layout="topleft"
@@ -2780,7 +2780,7 @@ even though the user gets a free copy.
width="130" />
<panel_inventory_object
follows="left|top"
- height="210"
+ height="325"
layout="topleft"
left="10"
name="contents_inventory"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 2652fae214..1ebc51f504 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_resize="true"
- height="300"
+ height="270"
layout="topleft"
+ min_height="146"
+ min_width="190"
name="floater_voice_controls"
title="Voice Controls"
save_visibility="true"
@@ -21,6 +23,10 @@
Conference Call
</string>
<string
+ name="title_peer_2_peer">
+ Call with [NAME]
+ </string>
+ <string
name="no_one_near">
No one near
</string>
@@ -148,4 +154,13 @@
multi_select="true"
name="speakers_list"
width="282" />
+ <panel
+ filename="panel_avatar_list_item.xml"
+ follows="left|right|top"
+ height="24"
+ layout="topleft"
+ left="0"
+ name="non_avatar_caller"
+ top="70"
+ width="282" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index f48af2f97e..3929e3277a 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -4,106 +4,100 @@
Single instance - only have one at a time, recycle it each spawn
-->
<floater
- legacy_header_height="18"
+ legacy_header_height="25"
bevel_style="in"
bg_opaque_image="Inspector_Background"
can_close="false"
can_minimize="false"
- height="138"
+ height="148"
layout="topleft"
name="inspect_group"
single_instance="true"
sound_flags="0"
visible="true"
- width="245">
+ 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="SansSerifLargeBold"
- height="18"
+ font="SansSerifLarge"
+ height="16"
left="8"
name="group_name"
- top="5"
- text_color="white"
+ top="10"
+ text_color="White"
use_ellipses="true"
- width="240"
+ width="175"
word_wrap="false">
Grumpity&apos;s Grumpy Group of Moose
</text>
<text
follows="all"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
text_color="White"
- height="18"
+ height="16"
left="8"
name="group_subtitle"
use_ellipses="true"
- top_pad="0"
- width="170">
+ width="175">
123 members
</text>
<text
follows="all"
- height="50"
+ height="45"
left="8"
name="group_details"
- top_pad="0"
- width="170"
+ 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="15"
+ height="13"
left="8"
name="group_cost"
- top_pad="2"
- width="170">
+ top_pad="3"
+ width="220">
L$123 to join
</text>
<icon
follows="all"
height="38"
- right="-25"
+ right="-10"
mouse_opaque="true"
name="group_icon"
- top="24"
- width="38" />
- <!-- Must be tab_stop="true" so something can hold focus even when the
- other buttons are disabled or invisible, otherwise inspector closes -->
- <button
- follows="top|left"
- height="18"
- image_disabled="ForwardArrow_Disabled"
- image_selected="ForwardArrow_Press"
- image_unselected="ForwardArrow_Off"
- name="view_profile_btn"
- right="-8"
- top="35"
- left_delta="110"
- tab_stop="true"
- width="18"
- commit_callback.function="InspectGroup.ViewProfile" />
+ top="10"
+ width="38"
+ bevel_style="in" />
<button
follows="bottom|left"
height="23"
label="Join"
left="8"
- top="246"
+ top="266"
name="join_btn"
- width="100"
+ width="103"
commit_callback.function="InspectGroup.Join"/>
<button
follows="bottom|left"
height="23"
label="Leave"
left="8"
- top="246"
+ top="266"
name="leave_btn"
- width="100"
+ width="103"
commit_callback.function="InspectGroup.Leave"/>
+ <button
+ follows="bottom|left"
+ height="23"
+ label="View Profile"
+ name="view_profile_btn"
+ top="266"
+ left="117"
+ width="103"
+ commit_callback.function="InspectGroup.ViewProfile" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 3bf7f50a2c..d99205b2fe 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -48,7 +48,7 @@
height="500"
layout="topleft"
mouse_opaque="false"
- name="main_view"
+ name="non_side_tray_view"
user_resize="true"
width="500">
<view bottom="500"
@@ -108,15 +108,25 @@
visible="false"
width="333"/>
</layout_stack>
- <floater_view follows="all"
+ <panel follows="all"
height="500"
left="0"
mouse_opaque="false"
- name="Floater View"
+ name="floater_view_holder"
tab_group="-1"
tab_stop="false"
top="0"
- width="1024"/>
+ 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"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 254c8a0f21..f48cc6d4bf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -586,20 +586,7 @@ To place the media on only one face, choose Select Texture and click on the desi
notext="Cancel"
yestext="OK"/>
</notification>
-
- <notification
- icon="alertmodal.tga"
- name="WhiteListInvalidatesHomeUrl"
- type="alertmodal">
-Adding this entry to the whitelist will invalidate the home URL you
-specified for this instance of media. You are not allowed to do this
-so the entry cannot be added to the whitelist.
- <usetemplate
- name="okbutton"
- yestext="Ok"/>
- </notification>
-
-
+
<notification
icon="alertmodal.tga"
name="MustBeInParcel"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 9cb765ae93..3e6ea84bf2 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -20,19 +20,21 @@
top="3"
width="18" />
<text_editor
- v_pad = "0"
- read_only = "true"
- follows="left|right"
- font.style="BOLD"
- height="12"
- layout="topleft"
- left_pad="5"
- right="-60"
- name="user_name"
- text_color="white"
- top="8"
- use_ellipses="true"
- value="Ericag Vader" />
+ allow_scroll="false"
+ v_pad = "0"
+ read_only = "true"
+ follows="left|right"
+ font.style="BOLD"
+ height="12"
+ layout="topleft"
+ left_pad="5"
+ right="-60"
+ name="user_name"
+ text_color="white"
+ bg_readonly_color="black"
+ top="8"
+ use_ellipses="true"
+ value="Ericag Vader" />
<text
font="SansSerifSmall"
follows="right"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 89f1fe35ca..b82a435b41 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -10,17 +10,27 @@
name="Media Settings General"
help_topic = "media_settings_general"
width="365">
-
- <text
- bottom_delta="-17"
- follows="top|left"
- height="15"
- left="10"
+
+ <text
+ bottom_delta="-25"
+ follows="top|left"
+ height="15"
+ left="10"
name="home_label">
Home URL:
</text>
+ <text
+ visible="false"
+ bottom_delta="0"
+ follows="top|left"
+ height="15"
+ left_delta="64"
+ text_color="red"
+ name="home_fails_whitelist_label">
+ (This URL does not pass the specified whitelist)
+ </text>
<line_editor
- bottom_delta="-21"
+ bottom_delta="-24"
enabled="true"
follows="left|top"
font="SansSerif"
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
index a26f74844e..7d9350b45f 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -30,8 +30,28 @@
name="whitelist"
width="315"
enabled="true" />
+ <icon
+ bottom_delta="-23"
+ right="-35"
+ width="16"
+ height="16"
+ image_name="parcel_color_EXP"
+ mouse_opaque="true"
+ follows="top|left"
+ name="parcel_color_EXP"
+ />
+ <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 URL fails against are marked:
+ </text>
<button
- bottom_delta="-30"
+ bottom_delta="-36"
follows="top|left"
height="20"
label="Add"
@@ -54,4 +74,17 @@
<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"
+ name="home_url_fails_whitelist">
+Warning: the home URL 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_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4f0d155876..4c2bd67337 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -162,16 +162,5 @@
tab_stop="false"
top="0"
width="50" />
- <button
- enabled="false"
- follows="bottom|right"
- height="25"
- label="▼"
- layout="topleft"
- name="overflow_btn"
- right="-10"
- tab_stop="false"
- top="0"
- width="30" />
</panel>
</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 fac0d5c60f..3aa5d3fae4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -318,4 +318,37 @@
name="plain_text_chat_history"
top_pad="5"
width="400" />
+ <text
+ left="30"
+ height="20"
+ width="300"
+ top_pad="20">
+ Show IMs in:
+ </text>
+ <radio_group
+ height="30"
+ layout="topleft"
+ left="30"
+ control_name="ChatWindow"
+ name="chat_window"
+ top_pad="10"
+ tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)"
+ width="331">
+ <radio_item
+ height="16"
+ label="Multiple windows"
+ layout="topleft"
+ left="0"
+ name="radio"
+ top="0"
+ width="150" />
+ <radio_item
+ height="16"
+ label="One window"
+ layout="topleft"
+ left_delta="145"
+ name="radio2"
+ top_delta="0"
+ width="150" />
+ </radio_group>
</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 9c66653e3c..5dcee9e965 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,28 +42,27 @@
<button
auto_resize="true"
halign="right"
- follows="right|bottom"
+ follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Off"
image_pressed="BuyArrow_Press"
height="16"
- left="-200"
+ right="-120"
name="buycurrency"
pad_right="20px"
tool_tip="My Balance: Click to buy more L$"
- top="1"
+ top="0"
width="90" />
<text
type="string"
- length="1"
font="SansSerifSmall"
text_readonly_color="TimeTextColor"
follows="right|bottom"
halign="right"
height="16"
- top="5"
+ top="4"
layout="topleft"
- left_pad="-5"
+ left_pad="-7"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
@@ -76,7 +75,7 @@
image_selected="parcel_drk_VoiceNo"
image_unselected="parcel_drk_Voice"
is_toggle="true"
- left_pad="5"
+ left_pad="18"
top="1"
name="volume_btn"
tool_tip="Global Volume Control"
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
index ccb57b6552..2822f7b841 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -14,6 +14,7 @@
background_visible="true"
bg_alpha_color="0.0 0.0 0.0 0.0" >
<text
+ clip_partial="true"
top="2"
left="10"
width="267"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index f16329f8d7..4293051dbd 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -29,6 +29,7 @@
>
<!-- 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="SansSerifBold"
@@ -39,6 +40,7 @@
word_wrap="true"
text_color="white"
top="5"
+ use_ellipses="true"
width="260">
Toast text;
</text>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 08c337455c..c0e1944f56 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<accordion_tab
- font="SansSerifBold"
header_bg_color="DkGray2"
header_collapse_img="Accordion_ArrowClosed_Off"
header_collapse_img_pressed="Accordion_ArrowClosed_Press"
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 90887dead6..ea78f6d0dd 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -11,7 +11,7 @@
add_landmark_image_disabled="Favorite_Star_Off"
add_landmark_image_hover="Favorite_Star_Over"
add_landmark_image_selected="Favorite_Star_Press"
- add_landmark_hpad="10"
+ add_landmark_hpad="12"
icon_hpad="2"
allow_text_entry="true"
list_position="below"
@@ -42,6 +42,7 @@
<for_sale_button
name="for_sale_btn"
image_unselected="parcel_lght_ForSale"
+ image_selected="parcel_lght_ForSale"
width="22"
height="18"
follows="right|top"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index 6dd92ea34b..166e8555fe 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<textbase/>
+<textbase clip_partial="false"/>