diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:55 -0400 |
| commit | cb47ae3264f3d9d22add17f2cbc5699c8620705f (patch) | |
| tree | c426adad23154cb74711a78174c412ab2a2b8034 /indra/newview/llpanelpicks.cpp | |
| parent | 2cddf137e3c785dc9efbe7e12b90d239d8eaa958 (diff) | |
| parent | 8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (diff) | |
merge changes for storm-971
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -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 --- 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") { |