summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-21 15:28:30 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-21 15:28:30 +0100
commit705a42bb55b35adfb432518036535396fb3c3d82 (patch)
tree4261a67f7f652fa4d05bc281a52816a454b997fd /indra/newview/skins/default/xui/en
parentfaa96995d359047c539d1262df0e668e2f578f94 (diff)
parent90cd379508d41e5930e4f62f86a229d5f14c66e3 (diff)
merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml7
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_self.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_list.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_wearable_list_item.xml4
5 files changed, 15 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 1d58e7a540..af8ab3fd9e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2022,12 +2022,13 @@ even though the user gets a free copy.
type="string"
length="1"
follows="left|top"
- height="10"
+ height="20"
layout="topleft"
left="10"
name="select_single"
top="5"
- width="252">
+ width="252"
+ word_wrap="true">
Select only one primitive to edit features.
</text>
<text
@@ -2049,7 +2050,7 @@ even though the user gets a free copy.
left="10"
name="Flexible1D Checkbox Ctrl"
tool_tip="Allows object to flex about the Z axis (Client-side only)"
- top_pad="10"
+ top_pad="20"
width="121" />
<spinner
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 9059745f46..2afa29ec10 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -23,11 +23,11 @@
function="Self.EnableStandUp" />
</menu_item_call>
<context_menu
- label="Take Off ▶"
+ label="Take Off"
layout="topleft"
name="Take Off &gt;">
<context_menu
- label="Clothes ▶"
+ label="Clothes"
layout="topleft"
name="Clothes &gt;">
<menu_item_call
@@ -174,11 +174,11 @@
</menu_item_call>
</context_menu>
<context_menu
- label="HUD ▶"
+ label="HUD"
layout="topleft"
name="Object Detach HUD" />
<context_menu
- label="Detach ▶"
+ label="Detach"
layout="topleft"
name="Object Detach" />
<menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 31f70d99ca..c751aa4e0c 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -72,7 +72,7 @@
</menu_item_call>
<menu_item_separator layout="topleft" />
<context_menu
- label="Put On ▶"
+ label="Put On"
name="Put On" >
<menu_item_call
enabled="false"
@@ -93,14 +93,14 @@
function="Object.EnableWear" />
</menu_item_call>
<context_menu
- label="Attach ▶"
+ label="Attach"
name="Object Attach" />
<context_menu
- label="Attach HUD ▶"
+ label="Attach HUD"
name="Object Attach HUD" />
</context_menu>
<context_menu
- label="Remove ▶"
+ label="Remove"
name="Remove">
<menu_item_call
enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 4ed5807808..2c32d9d303 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -130,7 +130,7 @@
layout="topleft"
name="Moderator Options Separator"/>
<context_menu
- label="Moderator Options &gt;"
+ label="Moderator Options"
layout="topleft"
name="Moderator Options">
<menu_item_check
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
index 5feac53c33..aa56b4ba63 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -37,11 +37,11 @@
function="Attachment.Detach" />
</menu_item_call>
<context_menu
- label="Attach to ▶"
+ label="Attach to"
layout="topleft"
name="wearable_attach_to" />
<context_menu
- label="Attach to HUD ▶"
+ label="Attach to HUD"
layout="topleft"
name="wearable_attach_to_hud" />
<menu_item_call