aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt9
-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
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3a474b4..fb74445 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
12009-10-26 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * Capped chat channel spinner to 1000000 (1 mil) as temp fix.
4 Very high numbers cause mysterious rounding problems.
5
6 modified: linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
7 modified: linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml:
8
9
12009-10-21 McCabe Maxsted <hakushakukun@gmail.com> 102009-10-21 McCabe Maxsted <hakushakukun@gmail.com>
2 11
3 * Added Advanced menu option for AllowMultipleViewers for testing purposes. 12 * Added Advanced menu option for AllowMultipleViewers for testing purposes.
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"