diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
| commit | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch) | |
| tree | 3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/llavataractions.cpp | |
| parent | 1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff) | |
| parent | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 13262efb3b..130428f3c0 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -386,12 +386,12 @@ void LLAvatarActions::showOnMap(const LLUUID& id) // static void LLAvatarActions::pay(const LLUUID& id) { - LLNotification::Params params("BusyModePay"); + LLNotification::Params params("DoNotDisturbModePay"); params.functor.function(boost::bind(&LLAvatarActions::handlePay, _1, _2, id)); - if (gAgent.getBusy()) + if (gAgent.isDoNotDisturb()) { - // warn users of being in busy mode during a transaction + // warn users of being in do not disturb mode during a transaction LLNotifications::instance().add(params); } else @@ -982,7 +982,7 @@ bool LLAvatarActions::handlePay(const LLSD& notification, const LLSD& response, S32 option = LLNotificationsUtil::getSelectedOption(notification, response); if (option == 0) { - gAgent.clearBusy(); + gAgent.setDoNotDisturb(false); } LLFloaterPayUtil::payDirectly(&give_money, avatar_id, /*is_group=*/false); |