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

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

meow-7.2.2
Chuck Linden 2010-02-17 12:59:15 -05:00
parent 087d4b7bc8 52c4711ab0
commit 29dd5afaa8
8 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatertools.cpp
View File

@ -1550,7 +1550,9 @@ void LLFloaterTools::updateMediaSettings()
// Auto scale
value_bool = default_media_data.getAutoScale();
// set default to auto scale TRUE -- angela EXT-5172
//value_bool = default_media_data.getAutoScale();
value_bool = true;
struct functor_getter_auto_scale : public LLSelectedTEGetFunctor< bool >
{
functor_getter_auto_scale(const LLMediaEntry& entry): mMediaEntry(entry) {}
@ -1561,8 +1563,9 @@ void LLFloaterTools::updateMediaSettings()
if ( object->getTE(face) )
if ( object->getTE(face)->getMediaData() )
return object->getTE(face)->getMediaData()->getAutoScale();
return mMediaEntry.getAutoScale();;
};
// return mMediaEntry.getAutoScale(); set default to auto scale TRUE -- angela EXT-5172
return true;
};
const LLMediaEntry &mMediaEntry;

2
indra/newview/llpanelobjectinventory.cpp
View File

@ -1568,7 +1568,7 @@ void LLPanelObjectInventory::reset()
{
clearContents();
setBorderVisible(FALSE);
//setBorderVisible(FALSE);
mCommitCallbackRegistrar.pushScope(); // push local callbacks

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

@ -88,7 +88,6 @@
<!-- First column -->
<button
height="20"
follows="top|left"
label="Button"
layout="topleft"
@ -100,7 +99,6 @@
<!-- "flyout_button" is a button that can spawn a menu -->
<flyout_button
follows="top|left"
height="20"
label="Flyout"
layout="topleft"
left_delta="0"
@ -136,7 +134,6 @@
<combo_box
bottom_delta="35"
follows="top|left"
height="16"
width="150"
label="Combobox"
layout="topleft"
@ -343,12 +340,10 @@ line to actually fit
<tab_container
follows="all"
height="400"
halign="center"
layout="topleft"
left="525"
name="group_tab_container"
tab_position="top"
tab_height="20"
tool_tip="tab container"
top="80"
width="300">

3
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -2785,6 +2785,9 @@ even though the user gets a free copy.
name="button permissions"
width="130" />
<panel_inventory_object
border="true"
border_visible="true"
bevel_style="in"
follows="left|top"
height="325"
layout="topleft"

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

@ -123,7 +123,7 @@
<button
follows="top|left"
height="20"
label="More"
label="Profile"
layout="topleft"
name="view_profile_btn"
left_delta="96"

1
indra/newview/skins/default/xui/en/widgets/button.xml
View File

@ -22,5 +22,6 @@
hover_glow_amount="0.15"
halign="center"
pad_bottom="3"
height="23"
scale_image="true">
</button>

1
indra/newview/skins/default/xui/en/widgets/combo_box.xml
View File

@ -2,6 +2,7 @@
<combo_box font="SansSerifSmall"
list_position="below"
max_chars="20"
height="23"
follows="right|top">
<combo_box.combo_button name="Combobox Button"
hover_glow_amount="0.15"

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<flyout_button list_position="below">
<flyout_button list_position="below" height="23">
<action_button scale_image="true"
image_selected="SegmentedBtn_Left_Selected"
image_unselected="SegmentedBtn_Left_Off"