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
Eric M. Tulla (BigPapi) 2010-01-06 16:51:50 -05:00
parent 97427f2a8d d1f71f7727
commit 3e6d795d7b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4820,6 +4820,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>MyOutfitsAutofill</key>
<map>
<key>Comment</key>
<string>Always autofill My Outfits from library when empty (else happens just once).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>NearMeRange</key>
<map>
<key>Comment</key>

2
indra/newview/llagentwearables.cpp
View File

@ -911,7 +911,7 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs
// If this is the very first time the user has logged into viewer2+ (from a legacy viewer, or new account)
// then auto-populate outfits from the library into the My Outfits folder.
if (LLInventoryModel::getIsFirstTimeInViewer2())
if (LLInventoryModel::getIsFirstTimeInViewer2() || gSavedSettings.getBOOL("MyOutfitsAutofill"))
{
gAgentWearables.populateMyOutfitsFolder();
}