diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-05 07:23:43 -0400 |
| commit | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (patch) | |
| tree | 327ccb1a74e828db62e8d19768ff953192d86f72 /indra/newview/llpanelpicks.cpp | |
| parent | fa4359e571fb67aca651efc3403274cdf0bb2616 (diff) | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
merge changes for STORM-1051
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llpanelpicks.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index c4f3866cad..ddce83c616 100755..100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -70,6 +70,7 @@ static const std::string CLASSIFIED_NAME("classified_name"); static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks("panel_picks"); + class LLPickHandler : public LLCommandHandler, public LLAvatarPropertiesObserver { @@ -83,6 +84,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks")) + { + LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { @@ -189,6 +196,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds")) + { + LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { |