livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 

--HG--
branch : product-engine
meow-7.2.2
Denis Serdjuk 2009-11-03 20:18:38 +02:00
parent ebfe3d93d9 db6fb2208e
commit a85f2b4b77
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/integration_tests/CMakeLists.txt
View File

@ -1,3 +1,3 @@
# -*- cmake -*-
add_subdirectory(llui_libtest)
#add_subdirectory(llui_libtest)

4
indra/newview/llnearbychatbar.cpp
View File

@ -77,6 +77,10 @@ LLGestureComboBox::LLGestureComboBox(const LLGestureComboBox::Params& p)
// refresh list from current active gestures
refreshGestures();
// This forces using of halign from xml, since LLComboBox
// sets it to LLFontGL::LEFT, if text entry is disabled
mButton->setHAlign(p.drop_down_button.font_halign);
}
LLGestureComboBox::~LLGestureComboBox()

10
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -12,13 +12,13 @@
can_dock="true"
can_minimize="true"
visible="true"
width="365"
width="400"
can_resize="true"
min_width="200"
min_height="150">
<layout_stack follows="left|top|right|bottom"
height="305"
width="365"
width="400"
layout="topleft"
orientation="horizontal"
name="im_panels"
@ -34,7 +34,7 @@
auto_resize="false"
user_resize="false" />
<layout_panel height="305"
width="200"
width="235"
left_delta="146"
top="0"
user_resize="false">
@ -61,9 +61,9 @@
name="chat_history"
parse_highlights="true"
allow_html="true"
width="195">
width="230">
</chat_history>
<line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="190">
<line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="225">
</line_editor>
</layout_panel>
</layout_stack>

5
indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
name="panel_im_control_panel"
width="146"
width="180"
height="215"
border="false">
<avatar_list
@ -16,10 +16,11 @@
show_info_btn="false"
show_profile_btn="false"
top="10"
width="140" />
width="180" />
<button
name="call_btn"
label="Call"
left_delta="27"
width="125"
height="20" />
<button

6
indra/newview/skins/default/xui/en/panel_group_control_panel.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
name="panel_im_control_panel"
width="146"
width="180"
height="238"
border="false">
<avatar_list
@ -16,11 +16,11 @@
show_info_btn="false"
show_profile_btn="false"
top="10"
width="140" />
width="180" />
<button
name="group_info_btn"
label="Group Info"
left_delta="3"
left_delta="27"
width="125"
height="20" />
<button

2
indra/newview/skins/default/xui/en/panel_im_control_panel.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_im_control_panel"
width="125"
width="128"
height="298"
border="false">

10
indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
View File

@ -15,14 +15,14 @@
image_disabled_selected="ComboButton_Disabled_Selected" />
<gesture_combo_box.drop_down_button name="Drop Down Button"
label=""
halign="center"
hover_glow_amount="0.15"
font="SansSerif"
scale_image="true"
pad_right="24"
image_unselected="DropDown_Off"
image_selected="DropDown_Selected"
image_disabled="DropDown_Disabled"
image_disabled_selected="DropDown_Disabled_Selected" />
image_unselected="PushButton_Off"
image_selected="PushButton_Selected"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Selected_Disabled" />
<gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
scroll_bar_bg_visible="true" />
<gesture_combo_box.combo_editor name="Combo Text Entry"