diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelgroupvoting.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp index 41650ad..9ef7841 100644 --- a/linden/indra/newview/llpanelgroupvoting.cpp +++ b/linden/indra/newview/llpanelgroupvoting.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -631,18 +632,18 @@ void LLPanelGroupVoting::handleResponse( | |||
631 | 632 | ||
632 | if (response == BALLOT) | 633 | if (response == BALLOT) |
633 | { | 634 | { |
634 | LLStringUtil::format_map_t args; | 635 | LLSD args; |
635 | 636 | ||
636 | if (success) | 637 | if (success) |
637 | { | 638 | { |
638 | args["[MESSAGE]"] = self->mPanel.getString("vote_recorded"); | 639 | args["MESSAGE"] = self->mPanel.getString("vote_recorded"); |
639 | } | 640 | } |
640 | else | 641 | else |
641 | { | 642 | { |
642 | args["[MESSAGE]"] = self->mPanel.getString("vote_previously_recorded"); | 643 | args["MESSAGE"] = self->mPanel.getString("vote_previously_recorded"); |
643 | } | 644 | } |
644 | 645 | ||
645 | LLNotifyBox::showXml("SystemMessage", args); | 646 | LLNotifications::instance().add("SystemMessage", args); |
646 | 647 | ||
647 | self->sendGroupVoteHistoryRequest(self->mGroupID); | 648 | self->sendGroupVoteHistoryRequest(self->mGroupID); |
648 | } | 649 | } |
@@ -1321,9 +1322,9 @@ void LLPanelGroupVoting::impl::onClickSubmitProposal(void *userdata) | |||
1321 | if ( self->mProposalText->getText().empty() ) | 1322 | if ( self->mProposalText->getText().empty() ) |
1322 | { | 1323 | { |
1323 | //throw up an error dialog | 1324 | //throw up an error dialog |
1324 | LLStringUtil::format_map_t args; | 1325 | LLSD args; |
1325 | args["[MESSAGE]"] = self->mPanel.getString("empty_proposal_txt"); | 1326 | args["MESSAGE"] = self->mPanel.getString("empty_proposal_txt"); |
1326 | gViewerWindow->alertXml("GenericAlert", args); | 1327 | LLNotifications::instance().add("GenericAlert", args); |
1327 | return; | 1328 | return; |
1328 | } | 1329 | } |
1329 | 1330 | ||
@@ -1366,7 +1367,7 @@ void LLPanelGroupVoting::impl::onClickViewProposalItem(void *userdata) | |||
1366 | } | 1367 | } |
1367 | else | 1368 | else |
1368 | { | 1369 | { |
1369 | gViewerWindow->alertXml("SelectProposalToView"); | 1370 | LLNotifications::instance().add("SelectProposalToView"); |
1370 | } | 1371 | } |
1371 | } | 1372 | } |
1372 | } | 1373 | } |
@@ -1406,7 +1407,7 @@ void LLPanelGroupVoting::impl::onClickViewHistoryItem(void *userdata) | |||
1406 | } | 1407 | } |
1407 | else | 1408 | else |
1408 | { | 1409 | { |
1409 | gViewerWindow->alertXml("SelectHistoryItemToView"); | 1410 | LLNotifications::instance().add("SelectHistoryItemToView"); |
1410 | } | 1411 | } |
1411 | } | 1412 | } |
1412 | } | 1413 | } |