aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default
diff options
context:
space:
mode:
authorJacek Antonelli2009-10-26 14:05:48 -0500
committerJacek Antonelli2009-10-26 14:05:48 -0500
commit1e2229af609be5878d1b8e06e2d2cc4e36c96b41 (patch)
tree833a2463b43e32351c995656740d9673900c7a9c /linden/indra/newview/skins/default
parentMerge remote branch 'mccabe/next' into next (diff)
downloadmeta-impy-1e2229af609be5878d1b8e06e2d2cc4e36c96b41.zip
meta-impy-1e2229af609be5878d1b8e06e2d2cc4e36c96b41.tar.gz
meta-impy-1e2229af609be5878d1b8e06e2d2cc4e36c96b41.tar.bz2
meta-impy-1e2229af609be5878d1b8e06e2d2cc4e36c96b41.tar.xz
Capped chat channel spinner to 1000000 (1 mil) as temp fix.
Very high numbers cause mysterious rounding problems.
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index dd66a83..ed23d8d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -61,7 +61,7 @@
61 <string name="gesture_label">Gestures</string> 61 <string name="gesture_label">Gestures</string>
62 <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20" 62 <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
63 increment="1.00" initial_val="0" label="Channel" label_width="50" left="0" 63 increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
64 max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control" 64 max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
65 width="100" tool_tip="Set the default channel for inworld chat"/> 65 width="100" tool_tip="Set the default channel for inworld chat"/>
66 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0" 66 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
67 enabled="true" follows="left|right|bottom" font="SansSerif" 67 enabled="true" follows="left|right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index ac3a74a..35883ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -10,7 +10,7 @@
10 tool_tip="Click here to see what has been said" width="93" /> 10 tool_tip="Click here to see what has been said" width="93" />
11 <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 11 <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20"
12 increment="1.00" initial_val="0" label="Channel" label_width="50" left="107" 12 increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
13 max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control" 13 max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
14 width="100" tool_tip="Set the default channel for inworld chat"/> 14 width="100" tool_tip="Set the default channel for inworld chat"/>
15 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23" 15 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
16 follows="left|right|bottom" font="SansSerif" 16 follows="left|right|bottom" font="SansSerif"