diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
| commit | 31e16be0daa10e6d66b133c308130524a7a0d881 (patch) | |
| tree | c44a007bc039e07e8ff938898d56a0534347750b /indra/newview/llshareavatarhandler.cpp | |
| parent | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (diff) | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
Merge latest from lindenlab/viewer-development
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) { |