summaryrefslogtreecommitdiff
path: root/indra/newview/llshareavatarhandler.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 19:19:24 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 19:19:24 -0400
commit9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (patch)
treef1e08f8c3ade8afc4c83a1574c0d54ac6c224ed1 /indra/newview/llshareavatarhandler.cpp
parent32012f9fd4e9a5cb37f3a91d79873b79b9e6531e (diff)
parent6faf2f8ee101162fdb1fe5959204055c9885968f (diff)
merge changes for storm-1077
Diffstat (limited to 'indra/newview/llshareavatarhandler.cpp')
-rw-r--r--indra/newview/llshareavatarhandler.cpp8
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)
{