diff options
author | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
commit | 752b3fdbe044069635a2c6cd000c481561985954 (patch) | |
tree | a162616b10fbabe65bf3a568c408e10e3cfd253a /indra/newview/llshareavatarhandler.cpp | |
parent | b092de554c7745d7c3c19bd30803640f36431da2 (diff) | |
parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff) |
merge
Diffstat (limited to 'indra/newview/llshareavatarhandler.cpp')
-rw-r--r-- | indra/newview/llshareavatarhandler.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp index 34194970b8..6b4f1d3dc6 100644 --- a/indra/newview/llshareavatarhandler.cpp +++ b/indra/newview/llshareavatarhandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" #include "llcommandhandler.h" #include "llavataractions.h" +#include "llnotificationsutil.h" +#include "llui.h" class LLShareWithAvatarHandler : public LLCommandHandler { @@ -38,6 +40,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarShare")) + { + LLNotificationsUtil::add("NoAvatarShare", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { |