diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:02:54 +0100 |
| commit | 06884cf1371d4c1ee02d337242e46b0f3bbe8837 (patch) | |
| tree | 9255ad9db22916ae0add7cae37705e58aa9c465e /indra/newview/skins | |
| parent | 663d8f7870c2858956aea8ab20129fd084a96dc8 (diff) | |
| parent | d69084d5d86d551adbc9721276aa60959b7d7899 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_scrolling_param.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index bd9925be1d..e94af2c8d5 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -15,7 +15,7 @@ follows="left|top|right|bottom" height="176" layout="topleft" - max_length="10000" + max_length="2147483647" name="Chat History Editor" parse_highlights="true" width="420" diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index 8042563900..19eb4bb0d6 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -110,7 +110,6 @@ increment="1" initial_value="0" label="[DESC]" - label_width="100" layout="bottom|left" left="6" max_val="100" |