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/llpanelpermissions.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/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 8a75385984..b46e04d462 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -876,8 +876,9 @@ void LLPanelPermissions::cbGroupID(LLUUID group_id, void* userdata) LLSelectMgr::getInstance()->sendGroup(group_id); } -void callback_deed_to_group(S32 option, void*) +bool callback_deed_to_group(const LLSD& notification, const LLSD& response) { + S32 option = LLNotification::getSelectedOption(notification, response); if (0 == option) { LLUUID group_id; @@ -888,12 +889,12 @@ void callback_deed_to_group(S32 option, void*) // LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT); } } + return false; } void LLPanelPermissions::onClickDeedToGroup(void* data) { - gViewerWindow->alertXml( "DeedObjectToGroup", - callback_deed_to_group, NULL); + LLNotifications::instance().add( "DeedObjectToGroup", LLSD(), LLSD(), callback_deed_to_group); } ///---------------------------------------------------------------------------- @@ -1092,7 +1093,7 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*) LLSelectMgr::getInstance()->selectGetSaleInfo(sale_info); if (!sale_info.isForSale()) { - gViewerWindow->alertXml("CantSetBuyObject"); + LLNotifications::instance().add("CantSetBuyObject"); // Set click action back to its old value U8 click_action = 0; @@ -1110,7 +1111,7 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*) if (!can_pay) { // Warn, but do it anyway. - gViewerWindow->alertXml("ClickActionNotPayable"); + LLNotifications::instance().add("ClickActionNotPayable"); } } LLSelectMgr::getInstance()->selectionSetClickAction(click_action); |