summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-14 12:48:31 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-14 12:48:31 -0700
commit9c2a19b833e071ca90e1e7840f6646200b07402a (patch)
tree89ac88068784227c3b339aa41bb0372a28fc0d60 /indra/newview/llpanelprofile.cpp
parent98bd63e0c8c73e300ae4af8071a9e2f167cfd6a6 (diff)
parent96296eede9313d8a0636599e9b06dd501aba083c (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rwxr-xr-xindra/newview/llpanelprofile.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 42c8f1d727..fd5c3362bb 100755
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -31,6 +31,7 @@
#include "llavataractions.h"
#include "llfloaterreg.h"
#include "llcommandhandler.h"
+#include "llnotificationsutil.h"
#include "llpanelpicks.h"
#include "lltabcontainer.h"
#include "llviewercontrol.h"
@@ -115,6 +116,12 @@ public:
if (verb == "pay")
{
+ if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarPay"))
+ {
+ LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
+ return true;
+ }
+
LLAvatarActions::pay(avatar_id);
return true;
}