diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-18 15:55:13 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-18 15:55:13 -0800 |
| commit | 6578144b7eda1dae885e5cc172751203b1d16c2d (patch) | |
| tree | cba111f9651c1a96f03196016bd7e2081619ab9b /indra/newview/skins/default/xui | |
| parent | be80b11d3063cc1b394ed604901418ba421cd86c (diff) | |
ACME-1236 : WIP : Added Gray Scale as an experimental filter in Flickr. Lots of ugly hacks for now
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml index b3af271f34..28e3557e15 100644 --- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml @@ -40,19 +40,24 @@ name="1024x768" value="[i1024,i768]" /> </combo_box> - <text - follows="left|top" - font="SansSerifSmall" - height="14" - left="208" - length="1" - halign="right" - name="file_size_label" - top="9" - type="string" - width="50"> - [SIZE] KB - </text> + <combo_box + control_name="SocialPhotoFilters" + follows="right|top" + name="filters_combobox" + tool_tip="Image filters" + top="6" + left="165" + height="21" + width="135"> + <combo_box.item + label="No Filter" + name="NoFilter" + value="NoFilter" /> + <combo_box.item + label="Gray Scale" + name="GrayScale" + value="GrayScale" /> + </combo_box> <panel height="150" width="250" |