diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llpanelgroupnotices.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 18fcc9d291..1b1a7e32a0 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -53,6 +53,7 @@ #include "roles_constants.h" #include "llviewerwindow.h" #include "llviewermessage.h" +#include "llnotifications.h" const S32 NOTICE_DATE_STRING_SIZE = 30; @@ -195,7 +196,8 @@ LLPanelGroupNotices::~LLPanelGroupNotices() if (mInventoryOffer) { // Cancel the inventory offer. - inventory_offer_callback( IOR_DECLINE , mInventoryOffer); + mInventoryOffer->forceResponse(IOR_DECLINE); + mInventoryOffer = NULL; } } @@ -345,7 +347,7 @@ void LLPanelGroupNotices::onClickOpenAttachment(void* data) { LLPanelGroupNotices* self = (LLPanelGroupNotices*)data; - inventory_offer_callback( IOR_ACCEPT , self->mInventoryOffer); + self->mInventoryOffer->forceResponse(IOR_ACCEPT); self->mInventoryOffer = NULL; self->mBtnOpenAttachment->setEnabled(FALSE); } @@ -357,7 +359,7 @@ void LLPanelGroupNotices::onClickSendMessage(void* data) if (self->mCreateSubject->getText().empty()) { // Must supply a subject - gViewerWindow->alertXml("MustSpecifyGroupNoticeSubject"); + LLNotifications::instance().add("MustSpecifyGroupNoticeSubject"); return; } send_group_notice( @@ -384,7 +386,7 @@ void LLPanelGroupNotices::onClickNewMessage(void* data) if (self->mInventoryOffer) { - inventory_offer_callback( IOR_DECLINE , self->mInventoryOffer); + self->mInventoryOffer->forceResponse(IOR_DECLINE); self->mInventoryOffer = NULL; } @@ -535,7 +537,7 @@ void LLPanelGroupNotices::showNotice(const std::string& subject, if (mInventoryOffer) { // Cancel the inventory offer for the previously viewed notice - inventory_offer_callback( IOR_DECLINE , mInventoryOffer); + mInventoryOffer->forceResponse(IOR_DECLINE); mInventoryOffer = NULL; } |