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

EXT-5172 set prefs review: "Allow media to auto-play" , media setting "auto play" and "auto scale" to 'true' by default

master
angela 2010-02-17 15:51:17 +08:00
parent 935d12277c
commit 3d3f72bd03
2 changed files with 7 additions and 4 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;