diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
| commit | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (patch) | |
| tree | 42d83ed5f5d34edf99c4b302d9d6744a33e5098f /indra/newview/llshareavatarhandler.cpp | |
| parent | 26f2762b89705a69e831016ea67af9500907721d (diff) | |
| parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
Merged with viewer-development.
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
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) { |