diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-15 18:08:01 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-15 18:08:01 -0400 |
| commit | 039fa244d6e3d5c6014de6a55d86675dd073309c (patch) | |
| tree | 8ca8c8c83df57baa1e7c993595b236ab2d4def74 | |
| parent | 68cdbf387cf876da8833157b76048991120dc3f6 (diff) | |
| parent | ac8f6011ca6fdd0fd8451d8485f4ecc92be072a6 (diff) | |
merge
| -rw-r--r-- | indra/edit-me-to-trigger-new-build.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index 0f6a8b8a1d..48e8b566a6 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1 +1 @@ -Wed Nov 7 00:25:19 UTC 2012 +Mon Apr 15 14:35:39 EDT 2013 diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 53b5593ac9..7b89e0617b 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,14 +89,12 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); if ( option == 0 ) - { - gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", TRUE); + { mEditWearable->revertChanges(); LLAppearanceMgr::getInstance()->wearBaseOutfit(); mLLFloaterSidePanelContainer->close(); return true; } - gSavedSettings.setBOOL("ExitOutfitEditWithoutSave", FALSE); return false; } @@ -131,7 +127,9 @@ void LLSidepanelAppearance::onClickConfirmExitWithoutSaveViaBack() void LLSidepanelAppearance::onClose(LLFloaterSidePanelContainer* obj) { mLLFloaterSidePanelContainer = obj; - if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !LLAppearanceMgr::getInstance()->isOutfitLocked() ) + if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && + !LLAppearanceMgr::getInstance()->isOutfitLocked() || + ( mEditWearable->isAvailable() && mEditWearable->isDirty() ) ) { LLSidepanelAppearance* pSelf = (LLSidepanelAppearance *)this; LLNotificationsUtil::add("ConfirmExitWithoutSave", LLSD(), LLSD(), boost::bind(&LLSidepanelAppearance::callBackExitWithoutSaveViaClose,pSelf,_1,_2) ); 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> |