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

automated merge of overnight fixes from viewer-2-0 and viewer-hotfix

master
Kent Quirk 2010-02-17 07:44:29 -05:00
parent f6304197a7 1a9cd13d79
commit c573679521
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -5360,7 +5360,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>PerAccountSettingsFile</key>
<map>

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

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"