diff options
author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/newview/llpreviewnotecard.cpp | |
parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) |
Merge
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
-rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index 510d91839d..850c3b350d 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -153,9 +153,12 @@ BOOL LLPreviewNotecard::canClose() } else { - // Bring up view-modal dialog: Save changes? Yes, No, Cancel - LLNotificationsUtil::add("SaveChanges", LLSD(), LLSD(), boost::bind(&LLPreviewNotecard::handleSaveChangesDialog,this, _1, _2)); - + if(!mSaveDialogShown) + { + mSaveDialogShown = TRUE; + // Bring up view-modal dialog: Save changes? Yes, No, Cancel + LLNotificationsUtil::add("SaveChanges", LLSD(), LLSD(), boost::bind(&LLPreviewNotecard::handleSaveChangesDialog,this, _1, _2)); + } return FALSE; } } @@ -639,6 +642,7 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data bool LLPreviewNotecard::handleSaveChangesDialog(const LLSD& notification, const LLSD& response) { + mSaveDialogShown = FALSE; S32 option = LLNotificationsUtil::getSelectedOption(notification, response); switch(option) { |