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

SH-4035:Added ignore message to notification

meow-7.2.2
prep@lindenlab.com 2013-04-10 16:53:46 -05:00
parent 24fa7736dd
commit 2798c355c4
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llsidepanelappearance.cpp
View File

@ -77,13 +77,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaBack(const LLSD& notificat
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 )
{
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", TRUE);
LLAppearanceMgr::instance().setOutfitDirty( true );
showOutfitsInventoryPanel();
LLAppearanceMgr::getInstance()->wearBaseOutfit();
return true;
}
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", FALSE);
return false;
}
@ -91,13 +89,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 )
{
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", TRUE);
{
LLAppearanceMgr::getInstance()->wearBaseOutfit();
mLLFloaterSidePanelContainer->close();
return true;
}
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", FALSE);
return false;
}

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -10039,9 +10039,10 @@ Cannot create large prims that intersect other players. Please re-try when othe
Closing this window will discard any changes you have made.
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
yestext="OK"
ignoretext="Don't show me this again."/>
</notification>
</notifications>