diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-01-30 18:58:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-01-30 18:58:03 -0800 |
| commit | 8f9e58428a14b39c35c32c901ea60f8c6cbe4627 (patch) | |
| tree | c7bcda7eacb1ccdddf71086802620fbdc71413a3 /indra/newview/skins | |
| parent | e970fa7f1ce9190b8a26e72bebbcceed04fb7494 (diff) | |
| parent | e42a372592a9b6c996d989a7e38c62761f73908a (diff) | |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_snapshot.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 019ddad33c..705225b839 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -381,5 +381,19 @@ top_pad="8" width="180" name="auto_snapshot_check" /> + <combo_box + control_name="PhotoFilters" + follows="left|right|top" + name="filters_combobox" + tool_tip="Image filters" + top_pad="8" + left="30" + height="21" + width="135"> + <combo_box.item + label="No Filter" + name="NoFilter" + value="NoFilter" /> + </combo_box> </panel> </floater> |