summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErica <erica@lindenlab.com>2010-01-29 17:16:06 -0800
committerErica <erica@lindenlab.com>2010-01-29 17:16:06 -0800
commite67bbf399ceec42b3f7788451c774cb8662ec4d4 (patch)
tree2562d9dbb0169b3fea67fe98f0155c5e9ae7defa
parenta358dc65c4fb7054bb5408f8b0d7424e7ca55eed (diff)
EXT-4756 Black text in sell land confirmation dialog, EXT-2241 layout of Preferences > Sound needs to be improved for I18N, EXT-4683 Build>Options submenus are non-intuitive, EXT-3787 System messages needs to be visually distinct in Nearby and IM
-rw-r--r--indra/newview/skins/default/colors.xml26
-rw-r--r--indra/newview/skins/default/xui/en/floater_color_picker.xml61
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml20
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml61
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml38
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml7
6 files changed, 102 insertions, 111 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e248047930..ec196245a1 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -47,7 +47,7 @@
<color
name="Black"
value="0 0 0 1" />
- <color
+ <colork
name="Black_10"
value="0 0 0 0.1" />
<color
@@ -77,6 +77,16 @@
<color
name="Purple"
value="1 0 1 1" />
+ <color
+ name="Lime"
+ value=".8 1 .73 1" />
+ <color
+ name="LtYellow"
+ value="1 1 .79 1" />
+ <color
+ name="LtOrange"
+ value="1 .85 .73 1" />
+
<!-- This color name makes potentially unused colors show up bright purple.
Leave this here until all Unused? are removed below, otherwise
the viewer generates many warnings on startup. -->
@@ -97,7 +107,7 @@
value="1 0.82 0.46 1" />
<color
name="AlertCautionTextColor"
- reference="Black" />
+ reference="LtYellow" />
<color
name="AgentLinkColor"
reference="White" />
@@ -226,10 +236,10 @@
reference="White" />
<color
name="ColorPaletteEntry16"
- reference="White" />
+ reference="LtYellow" />
<color
name="ColorPaletteEntry17"
- reference="White" />
+ reference="LtGreen" />
<color
name="ColorPaletteEntry18"
reference="LtGray" />
@@ -544,7 +554,7 @@
reference="White" />
<color
name="ObjectChatColor"
- reference="EmphasisColor" />
+ reference="EmphasisColor_35" />
<color
name="OverdrivenColor"
reference="Red" />
@@ -592,7 +602,7 @@
value="0.39 0.39 0.39 1" />
<color
name="ScriptErrorColor"
- value="0.82 0.27 0.27 1" />
+ value="Red" />
<color
name="ScrollBGStripeColor"
reference="Transparent" />
@@ -649,7 +659,7 @@
reference="FrogGreen" />
<color
name="SystemChatColor"
- reference="White" />
+ reference="LtGray" />
<color
name="TextBgFocusColor"
reference="White" />
@@ -703,7 +713,7 @@
reference="White" />
<color
name="llOwnerSayChatColor"
- reference="LtGray" />
+ reference="LtYellow" />
<!-- New Colors -->
<color
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 fbecebc363..9009c60a99 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -13,20 +13,19 @@
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"
@@ -39,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"
@@ -65,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"
@@ -91,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"
@@ -117,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"
@@ -143,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"
@@ -170,11 +159,11 @@
height="20"
label="Apply now"
layout="topleft"
- left="12"
+ left="10"
name="apply_immediate"
top_pad="185"
width="100" />
- <button
+ <button
follows="left|bottom"
height="28"
image_selected="eye_button_active.tga"
@@ -185,7 +174,7 @@
width="28" />
<button
follows="right|bottom"
- height="20"
+ height="23"
label="OK"
label_selected="OK"
layout="topleft"
@@ -195,7 +184,7 @@
width="100" />
<button
follows="right|bottom"
- height="20"
+ height="23"
label="Cancel"
label_selected="Cancel"
layout="topleft"
@@ -209,7 +198,7 @@
follows="left|top"
height="16"
layout="topleft"
- left="12"
+ left="10"
name="Current color:"
top="172"
width="110">
@@ -221,7 +210,7 @@
follows="left|top"
height="16"
layout="topleft"
- left="12"
+ left="10"
name="(Drag below to save.)"
top_pad="66"
width="130">
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 35518cd13b..56028bb2e5 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -87,16 +87,6 @@
label="Remove &gt;"
name="Remove">
<menu_item_call
- enabled="false"
- label="Take"
- name="Pie Object Take">
- <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
enabled="false"
label="Report Abuse"
name="Report Abuse...">
@@ -134,6 +124,16 @@
</menu_item_call>
</context_menu>
<menu_item_separator layout="topleft" />
+ <menu_item_call
+ enabled="false"
+ label="Take"
+ name="Pie Object Take">
+ <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
enabled="false"
label="Take Copy"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a98a049c17..7a4f63bfe4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -662,6 +662,18 @@
<menu_item_call.on_enable
function="Tools.EnableUnlink" />
</menu_item_call>
+ <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_separator
layout="topleft" />
<menu_item_call
@@ -799,18 +811,6 @@
layout="topleft"
name="Options"
tear_off="true">
- <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 Upload Permissions"
layout="topleft"
@@ -819,10 +819,10 @@
function="Floater.Toggle"
parameter="perm_prefs" />
</menu_item_call>
- <menu_item_check
- label="Show Advanced Permissions"
- layout="topleft"
- name="DebugPermissions">
+ <menu_item_check
+ label="Show Advanced Permissions"
+ layout="topleft"
+ name="DebugPermissions">
<menu_item_check.on_check
function="CheckControl"
parameter="DebugPermissions" />
@@ -832,13 +832,7 @@
</menu_item_check>
<menu_item_separator
layout="topleft" />
- <menu
- create_jump_keys="true"
- label="Selection"
- layout="topleft"
- name="Selection"
- tear_off="true">
- <menu_item_check
+ <menu_item_check
label="Select Only My Objects"
layout="topleft"
name="Select Only My Objects">
@@ -866,14 +860,9 @@
control="RectangleSelectInclusive" />
<menu_item_check.on_click
function="Tools.SelectBySurrounding" />
- </menu_item_check>
- </menu>
- <menu
- create_jump_keys="true"
- label="Show"
- layout="topleft"
- name="Show"
- tear_off="true">
+ </menu_item_check>
+ <menu_item_separator
+ layout="topleft" />
<menu_item_check
label="Show Hidden Selection"
layout="topleft"
@@ -902,13 +891,8 @@
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
+ layout="topleft" />
<menu_item_check
label="Snap to Grid"
layout="topleft"
@@ -953,7 +937,6 @@
<menu_item_call.on_enable
function="Tools.EnableToolNotPie" />
</menu_item_call>
- </menu>
</menu>
<menu
create_jump_keys="true"
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 6e0b94ac2b..433dfc17fe 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -23,7 +23,7 @@
layout="topleft"
left="0"
name="radio"
- value="0"
+ value="0"
top="10"
width="125" />
<radio_item
@@ -32,7 +32,7 @@
layout="topleft"
left_delta="145"
name="radio2"
- value="1"
+ value="1"
top_delta="0"
width="125" />
<radio_item
@@ -41,7 +41,7 @@
layout="topleft"
left_delta="170"
name="radio3"
- value="2"
+ value="2"
top_delta="0"
width="125" />
</radio_group>
@@ -105,7 +105,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.6 0.6 1 1"
+ color="LtGray"
follows="left|top"
height="47"
label_width="60"
@@ -136,7 +136,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.8 1 1 1"
+ color="LtGray"
follows="left|top"
height="47"
label_width="44"
@@ -167,7 +167,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.82 0.82 0.99 1"
+ color="Red"
follows="left|top"
height="47"
layout="topleft"
@@ -197,7 +197,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.7 0.9 0.7 1"
+ color="EmphasisColor_35"
follows="left|top"
height="47"
layout="topleft"
@@ -227,7 +227,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.7 0.9 0.7 1"
+ color="LtYellow"
follows="left|top"
height="47"
layout="topleft"
@@ -257,7 +257,7 @@
</text>
<color_swatch
can_apply_immediately="true"
- color="0.6 0.6 1 1"
+ color="EmphasisColor"
follows="left|top"
height="47"
layout="topleft"
@@ -316,22 +316,30 @@
<text
left="30"
height="20"
- width="300"
+ width="120"
top_pad="20">
- Show IMs in: (Requires restart)
+ Show IMs in:
</text>
+ <text
+ left_pad="6"
+ height="20"
+ width="100"
+ text_color="White_25"
+ >
+ (requires restart)
+ </text>
<radio_group
height="30"
layout="topleft"
- left_delta="30"
+ left="30"
control_name="ChatWindow"
name="chat_window"
top_pad="0"
- tool_tip="Show your Instant Messages in separate windows, or in one window with many tabs (Requires restart)"
+ 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="Multiple windows"
+ label="Separate windows"
layout="topleft"
left="0"
name="radio"
@@ -340,7 +348,7 @@
width="150" />
<radio_item
height="16"
- label="One window"
+ label="Tabs"
layout="topleft"
left_delta="0"
name="radio2"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d8e3f4ccfb..c01a032209 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -236,9 +236,10 @@
disabled_control="CmdLineDisableVoice"
label="Enable voice"
layout="topleft"
- left="28"
+ font.style="BOLD"
+ left="101"
name="enable_voice_check"
- top_pad="5"
+ top_pad="13"
width="110"
>
</check_box>
@@ -365,7 +366,7 @@
name="device_settings_panel"
class="panel_voice_device_settings"
width="501"
- top="285">
+ top="280">
<panel.string
name="default_text">
Default