summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-10-06 01:25:47 +0000
committerRichard Nelson <richard@lindenlab.com>2009-10-06 01:25:47 +0000
commit14d06ebe953da7e50b5c9086eee3f048578438ba (patch)
treea4f19e9bec6aded07e66c06a5603e5f9d0a81451 /indra/newview/skins/default/xui
parente3d9c7d7bfa7722e22df9380baa4f044ac1be80f (diff)
made "more" link in LLExpandableTextBox localizable
fixed logic for showing/hiding "more" link in LLExpandableTextBox fixed invisible background on combobox popup list reviewed by Leyla
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/combo_box.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/expandable_text.xml1
2 files changed, 4 insertions, 1 deletions
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 d7369d0726..0dbca318b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -20,7 +20,9 @@
image_unselected="DropDown_Off"
image_selected="DropDown_Selected"
image_disabled="DropDown_Disabled" />
- <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" />
+ <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+ background_visible="true"
+ />
<combo_box.combo_editor name="Combo Text Entry"
select_on_focus="true"
font="SansSerifSmall" />
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index e470f42d36..6381dce1d6 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -2,6 +2,7 @@
<expandable_text
max_height="300" >
<textbox
+ more_label="More"
follows="left|top"
name="text"
use_ellipses="true"