diff options
Diffstat (limited to 'indra/newview')
19 files changed, 21 insertions, 28 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 41cbc21fe9..d47b994322 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -594,7 +594,8 @@ bool LLAppViewer::init() // into the log files during normal startup until AFTER // we run the "program crashed last time" error handler below. // - + LLFastTimer::reset(); + // Need to do this initialization before we do anything else, since anything // that touches files should really go through the lldir API gDirUtilp->initAppDirs("SecondLife"); diff --git a/indra/newview/llchatmsgbox.cpp b/indra/newview/llchatmsgbox.cpp index 6eaafc9059..12626e3b43 100644 --- a/indra/newview/llchatmsgbox.cpp +++ b/indra/newview/llchatmsgbox.cpp @@ -59,7 +59,7 @@ public: /*virtual*/ S32 getWidth(S32 first_char, S32 num_chars) const { - return mEditor->getDocumentPanel()->getRect().getWidth(); + return mEditor->getDocumentView()->getRect().getWidth(); } /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index beb16c267e..b015f668e4 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -703,7 +703,8 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) .image(LLUI::getUIImage("Info")) .click_callback(boost::bind(showAvatarInspector, hover_object->getID())) .visible_time_near(6.f) - .visible_time_far(3.f)); + .visible_time_far(3.f) + .wrap(false)); } } else @@ -746,7 +747,8 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) .image(LLUI::getUIImage("Info")) .click_callback(boost::bind(showObjectInspector, hover_object->getID())) .visible_time_near(6.f) - .visible_time_far(3.f)); + .visible_time_far(3.f) + .wrap(false)); } } } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 24d00cba16..22141011a2 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1465,6 +1465,7 @@ void LLViewerWindow::initBase() LLToolTipView::Params hvp; hvp.name("tooltip view"); hvp.rect(full_window); + hvp.follows.flags(FOLLOWS_ALL); gToolTipView = LLUICtrlFactory::create<LLToolTipView>(hvp); getRootView()->addChild(gToolTipView); diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index bdce8fa4fc..95e4247a05 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -34,7 +34,6 @@ font="SansSerif" height="64" border_visible="false" - hide_scrollbar="true" layout="topleft" left="77" max_length="2147483647" diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index e2f4a73ec8..b7779687ec 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -23,7 +23,6 @@ <text_editor enabled="false" height="60" - hide_scrollbar="true" layout="topleft" left_delta="0" name="comment_text" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 8ed2047a27..cc0fc34dd5 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -277,6 +277,7 @@ follows="top|left" label="Spinner" layout="topleft" + label_width="45" name="test_spinner" tool_tip="spinner"/> <text diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml index 4329982209..546f46205f 100644 --- a/indra/newview/skins/default/xui/en/panel_audio_device.xml +++ b/indra/newview/skins/default/xui/en/panel_audio_device.xml @@ -81,7 +81,6 @@ enabled="false" height="60" border_visible="false" - hide_scrollbar="true" layout="topleft" left_delta="10" max_length="65535" diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml index 34b4736979..e4f6e7bd44 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml @@ -61,7 +61,6 @@ font="SansSerifSmall" read_only="true" bg_readonly_color="0 0 0 0" - hide_scrollbar="true" word_wrap="true" mouse_opaque="true" name="msg_text" > diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 5dd03656c6..b9a01d80f9 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -120,7 +120,6 @@ follows="left|top|right" height="100" width="220" - hide_scrollbar="true" layout="topleft" left="10" top_pad="2" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 03e2d35b9f..e49914d5e6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -45,7 +45,6 @@ Hover your mouse over the options for more help. follows="left|top" left="5" height="75" - hide_scrollbar="true" layout="topleft" max_length="511" name="charter" diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index ffc2f279bc..82a3c98dd9 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -187,7 +187,6 @@ the General tab. </text> <text_editor height="75" - hide_scrollbar="true" layout="topleft" left_pad="3" max_length="511" @@ -344,7 +343,6 @@ the General tab. <text_editor enabled="false" height="150" - hide_scrollbar="true" layout="topleft" left="10" max_length="511" diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 7b8bd8b337..6435951157 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -625,7 +625,6 @@ things in this group. There's a broad variety of Abilities. type="string" halign="left" height="48" - hide_scrollbar="true" layout="topleft" left="135" max_length="254" @@ -723,7 +722,6 @@ things in this group. There's a broad variety of Abilities. enabled="false" halign="left" height="48" - hide_scrollbar="true" layout="topleft" left_delta="0" max_length="512" diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml index 2056ec14d5..4274a37497 100644 --- a/indra/newview/skins/default/xui/en/panel_notes.xml +++ b/indra/newview/skins/default/xui/en/panel_notes.xml @@ -58,7 +58,6 @@ <text_editor follows="left|top" height="200" - hide_scrollbar="true" layout="topleft" left="10" max_length="1000" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml index d640d3ad88..63c2d4538e 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -42,7 +42,7 @@ height="20" layout="topleft" left_pad="5" - use_ellipsis="true" + use_ellipses="true" name="region" text_color="white" top="4" diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index 6381dce1d6..120deaaef5 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -8,8 +8,8 @@ use_ellipses="true" word_wrap="true" tab_stop="true" - v_pad="2" - h_pad="3" > + v_pad="3" + h_pad="4" > </textbox> <scroll name="scroll" diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml index 8ace7b96bc..bb46ec0954 100644 --- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml @@ -5,7 +5,7 @@ font="SansSerifSmall" max_length="255" embedded_items="false" - hide_scrollbar="false" + allow_scroll="true" border_visible="false" word_wrap="false" ignore_tab="true" @@ -15,8 +15,8 @@ default_color="TextDefaultColor" text_color="TextFgColor" text_readonly_color="TextFgReadOnlyColor" - h_pad="5" - v_pad="3" + h_pad="6" + v_pad="4" bg_visible="true" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 5914c21b2b..22bda45923 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <text allow_html="true" - clip_to_rect="false" mouse_opaque="false" name="text_box" font="SansSerifSmall" @@ -8,8 +7,8 @@ tab_stop="false" halign="left" hover_color="LabelSelectedColor" - h_pad="-1" - hide_scrollbar="true" + h_pad="0" + allow_scroll="false" text_readonly_color="LabelDisabledColor" bg_writeable_color="FloaterDefaultBackgroundColor" border_color="DefaultHighlightLight" @@ -18,5 +17,5 @@ border_visible="false" hover="false" text_color="LabelTextColor" - v_pad="-1" + v_pad="0" max_length="4096"/> diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml index c352abca3b..e5dc022633 100644 --- a/indra/newview/skins/default/xui/en/widgets/textbase.xml +++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<textbase clip_to_rect="true" - h_pad="4" - v_pad="4"/> +<textbase allow_scroll="true" + h_pad="5" + v_pad="5"/> |