diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-23 11:36:00 -0700 |
| commit | 3ad81bb4a642d25018b773d2ef005380664d8170 (patch) | |
| tree | b1bbf66c0babf6c541858b34d4a7f66ad19308b0 /indra/newview/llpanelpicks.cpp | |
| parent | a2c659378b8b7c8a4128c61b5cde91eccc9db4e6 (diff) | |
| parent | 62a958d341532287519a23a362ff7aebd501e1c9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r-- | 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 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") { |