diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-01-28 19:00:46 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-01-28 19:00:46 -0800 |
| commit | f7a90c680a007775efe0f8556c6712a08e489aab (patch) | |
| tree | c638e6ef916d01c063d1c4f873b0f80e2225009a /indra/newview/skins | |
| parent | b35889a6510440692be4b7f1aa590cf645fbba90 (diff) | |
ACME-1275 : Implemented filters to the Twitter and Facebook panels
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_facebook_photo.xml | 27 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_twitter_photo.xml | 27 |
2 files changed, 28 insertions, 26 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml index 2d46665bae..0a90d000bd 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml @@ -44,19 +44,20 @@ name="1200x630" value="[i1200,i630]" /> </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> <panel height="150" width="250" diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml index 14268c1bcf..e044dbdf55 100644 --- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml @@ -96,19 +96,20 @@ 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> <panel height="150" width="250" |