summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-24 22:11:24 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-24 22:11:24 -0500
commitccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch)
tree71163fde19389893c8951ebb723ddf9379318518 /indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
parent2369fa96c24bafbd032c85b58767502cfd37ebaf (diff)
parent5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff)
viewer-2.0 automated merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_texture_ctrl.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_texture_ctrl.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 4679ae467d..113da9ea4d 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -49,7 +49,6 @@
<button
enabled="false"
follows="left|bottom"
- font="SansSerifSmall"
height="20"
label="Default"
label_selected="Default"
@@ -61,7 +60,6 @@
<button
enabled="false"
follows="left|bottom"
- font="SansSerifSmall"
height="20"
label="None"
label_selected="None"
@@ -72,7 +70,6 @@
width="80" />
<button
follows="left|bottom"
- font="SansSerifSmall"
height="20"
label="Blank"
label_selected="Blank"