diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-18 11:56:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-18 11:56:39 -0400 |
| commit | 014a5fa513719d7b4f8c32d1a69e8b443fab92a7 (patch) | |
| tree | 6a3c81b1cfb23da170ec3294163a40c96e0566e4 /indra/newview/skins | |
| parent | 210ff45bd62fe6aec299a16daa555ad791370df5 (diff) | |
| parent | bca5c1ed7956d2b32f1ba1609edd2f00566adc81 (diff) | |
merge changes for STORM-2040
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_snapshot.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 4b8f4c8fed..f0a175902b 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -294,8 +294,7 @@ width="199" top_pad="-16"/> <panel - background_visible="true" - bg_alpha_color="0 0 0 0.25" + background_visible="false" follows="left|top" font="SansSerifLarge" halign="center" @@ -326,8 +325,7 @@ </text> </panel> <panel - background_visible="true" - bg_alpha_color="0 0 0 0.25" + background_visible="false" follows="left|top" font="SansSerifLarge" halign="center" @@ -420,10 +418,11 @@ type="string" font="SansSerifSmall" length="1" - follows="left|top" + follows="left|top|right" height="14" layout="topleft" - left_delta="5" + left="220" + right="-20" halign="left" name="image_res_text" top_delta="5" diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index 5782ba7d04..ea579c6dae 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -48,10 +48,6 @@ right="-5" top_pad="5"> <combo_box.item - label="Current Window" - name="CurrentWindow" - value="[i0,i0]" /> - <combo_box.item label="Small (128x128)" name="Small(128x128)" value="[i128,i128]" /> |