From 2798c355c441f8d92a02537eca6e253c8fbf2bc4 Mon Sep 17 00:00:00 2001
From: "prep@lindenlab.com" <prep@lindenlab.com>
Date: Wed, 10 Apr 2013 16:53:46 -0500
Subject: SH-4035:Added ignore message to notification
---
indra/newview/llsidepanelappearance.cpp | 6 +-----
indra/newview/skins/default/xui/en/notifications.xml | 7 ++++---
2 files changed, 5 insertions(+), 8 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index ae6ceabdaa..6d2b643434 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -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;
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2170283af2..1ff63c6def 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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>
--
cgit v1.2.3