From bc2aca863f5d27f551e48a2de8f879360a3a96ab Mon Sep 17 00:00:00 2001 From: leyla Date: Mon, 14 Mar 2011 11:23:15 -0700 Subject: SOCIAL-687 Call, Map, Share, and Pay options available in web profile for users in minimal skin --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++ indra/newview/app_settings/settings_minimal.xml | 33 +++++++++++++++++ indra/newview/llfloaterworldmap.cpp | 6 ++++ indra/newview/llpanelprofile.cpp | 7 ++++ indra/newview/llshareavatarhandler.cpp | 8 +++++ indra/newview/llvoicecallhandler.cpp | 8 +++++ .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++ 7 files changed, 137 insertions(+) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..42fd9929ae 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12476,6 +12476,39 @@ Value 1 + EnableAvatarPay + + Comment + Enable paying other avatars from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableVoiceCall + + Comment + Enable voice calls from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableAvatarShare + + Comment + Enable sharing from web link + Persist + 1 + Type + Boolean + Value + 1 + SearchFromAddressBar Comment diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 73c865bc9f..4770c7d7e6 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -270,6 +270,39 @@ Value 0 + EnableAvatarPay + + Comment + Enable paying other avatars from web link + Persist + 1 + Type + Boolean + Value + 0 + + EnableVoiceCall + + Comment + Enable voice calls from web link + Persist + 1 + Type + Boolean + Value + 0 + + EnableAvatarShare + + Comment + Enable sharing from web link + Persist + 1 + Type + Boolean + Value + 0 + DoubleClickShowWorldMap Comment diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index e6d91a658d..03cf0332a9 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -148,6 +148,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableWorldMap")) + { + LLNotificationsUtil::add("NoWorldMap", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 4f13c0c022..cead6c24cd 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" @@ -105,6 +106,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; } 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) { diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 274bd75208..2050dab689 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" #include "llcommandhandler.h" #include "llavataractions.h" +#include "llnotificationsutil.h" +#include "llui.h" class LLVoiceCallAvatarHandler : public LLCommandHandler { @@ -38,6 +40,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableVoiceCall")) + { + LLNotificationsUtil::add("NoVoiceCall", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + //Make sure we have some parameters if (params.size() == 0) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 50193a198b..8e7da11c25 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7139,6 +7139,48 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' yestext="Quit" notext="Don't Quit"/> + + + fail + confirm + Voice calls are only available in Standard mode. Would you like to logout and change modes? + + + + + fail + confirm + Sharing is only available in Standard mode. Would you like to logout and change modes? + + + + + fail + confirm + Paying other residents is only available in Standard mode. Would you like to logout and change modes? + + - Your CPU speed does not meet the minimum requirements. -- cgit v1.2.3