From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 08:04:56 +0000
Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
 ignore-dead-branch

---
 indra/newview/skins/default/xui/en/widgets/multi_slider.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/multi_slider.xml

(limited to 'indra/newview/skins/default/xui/en/widgets/multi_slider.xml')

diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
new file mode 100644
index 0000000000..e0900b48f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_slider text_color="LabelTextColor"
+                  text_disabled_color="LabelDisabledColor"
+                  draw_track="true"
+                  use_triangle="false"
+                  font="SansSerifSmall"/>
-- 
cgit v1.2.3