viewer2 merge.

1 files changed, 0 insertions, 101 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
deleted file mode 100644
index 20bd555a03..0000000000
--- a/indra/newview/skins/default/xui/en/floater_test_slider.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="500"
- layout="topleft"
- name="floater_test_slider"
- help_topic="floater_test_slider"
- translate="false"
- width="450">
-    <slider
-     height="20"
-     label="Generic Slider"
-     layout="topleft"
-     left="10"
-     name="generic_slider"
-     top="40"
-     width="250" />
-    <slider
-     height="20"
-     label="Callback Slider"
-     layout="topleft"
-     left_delta="0"
-     name="callback_slider"
-     top_pad="20"
-     width="400">
-        <slider.mouse_up_callback
-         function="Test.TestCallback"
-         parameter="test" />
-    </slider>
-    <slider
-     height="20"
-     increment="1"
-     initial_value="2.0"
-     label="Value Slider"
-     layout="topleft"
-     left_delta="0"
-     max_val="5"
-     min_val="1"
-     name="value_slider"
-     top_pad="20"
-     width="250" />
-    <slider
-     height="20"
-     label="Mini Slider 1"
-     layout="topleft"
-     left_delta="0"
-     name="mini_slider_1"
-     top_pad="20"
-     width="200" />
-    <slider
-     height="20"
-     label="Mini Slider 2"
-     layout="topleft"
-     left_pad="20"
-     name="mini_slider_2"
-     top_delta="0"
-     width="200" />
-    <slider_bar
-     bottom="320"
-     height="100"
-     left="20"
-     name="slider_bar_vertical"
-     orientation="vertical"
-     width="20" />
-    <slider_bar
-     bottom="300"
-     height="20"
-     increment="1"
-     initial_value="2.0"
-     label="Slider Bar"
-     layout="topleft"
-     max_val="5"
-     min_val="1"
-     left_pad="20"
-     name="slider_bar"
-     width="300" />
-    <slider
-     bottom="360"
-     decimal_digits="1"
-     height="20"
-     label="Red Slider"
-     label_width="100"
-     layout="topleft"
-     name="red_slider"
-     text_color="red"
-     text_width="40" />
-	<slider
-	 width ="140"
-     bottom="490"
-     decimal_digits="1"
-     height="100"
-	 left="20"
-     label="Red Slider Vertical"
-     label_width="100"
-     layout="topleft"
-     name="red_slider_vertical"
-     text_color="red"
-	 orientation="vertical"
-     text_width="20" /> 
-</floater>