Skip to content
Snippets Groups Projects
Commit 2798c355 authored by prep@lindenlab.com's avatar prep@lindenlab.com
Browse files

SH-4035:Added ignore message to notification

parent 24fa7736
No related branches found
No related tags found
No related merge requests found
...@@ -77,13 +77,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaBack(const LLSD& notificat ...@@ -77,13 +77,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaBack(const LLSD& notificat
S32 option = LLNotificationsUtil::getSelectedOption(notification, response); S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 ) if ( option == 0 )
{ {
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", TRUE);
LLAppearanceMgr::instance().setOutfitDirty( true ); LLAppearanceMgr::instance().setOutfitDirty( true );
showOutfitsInventoryPanel(); showOutfitsInventoryPanel();
LLAppearanceMgr::getInstance()->wearBaseOutfit(); LLAppearanceMgr::getInstance()->wearBaseOutfit();
return true; return true;
} }
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", FALSE);
return false; return false;
} }
...@@ -91,13 +89,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica ...@@ -91,13 +89,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
{ {
S32 option = LLNotificationsUtil::getSelectedOption(notification, response); S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 ) if ( option == 0 )
{ {
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", TRUE);
LLAppearanceMgr::getInstance()->wearBaseOutfit(); LLAppearanceMgr::getInstance()->wearBaseOutfit();
mLLFloaterSidePanelContainer->close(); mLLFloaterSidePanelContainer->close();
return true; return true;
} }
gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", FALSE);
return false; return false;
} }
......
...@@ -10039,9 +10039,10 @@ Cannot create large prims that intersect other players. Please re-try when othe ...@@ -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. Closing this window will discard any changes you have made.
<tag>confirm</tag> <tag>confirm</tag>
<usetemplate <usetemplate
name="okcancelbuttons" name="okcancelignore"
notext="Cancel" notext="Cancel"
yestext="OK"/> yestext="OK"
ignoretext="Don't show me this again."/>
</notification> </notification>
</notifications> </notifications>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment