summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
committerDave Parks <davep@lindenlab.com>2012-06-22 14:59:40 -0500
commit667e5d196817dffa7eb68ec53dd02ac7a66d0ea2 (patch)
treed81607c82abc142d0b747f8dd64dd1d0509bbdb4 /indra/newview/skins/default
parent9e9d32de384b2807f195be48f49fbdec725f45d1 (diff)
Merge cleanup
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_texture_ctrl.xml10
1 files changed, 0 insertions, 10 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 2e29c61cb2..6021ba0a5a 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -134,16 +134,6 @@
top_delta="-25"
name="Pipette"
width="28" />
- <check_box
- follows="left|bottom"
- height="20"
- initial_value="true"
- label="Live Preview"
- layout="topleft"
- left="4"
- name="apply_immediate_check"
- top="262"
- width="120" />
<text
follows="left|bottom"
height="20"