diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
commit | 4046e0801ba4f7a01311de06b110177630ea6e04 (patch) | |
tree | 47ad154496cb50ef39617cf1b9ddc147d1358076 /indra/newview/llpanelplaces.cpp | |
parent | 40325a7347a059f913e01b449c924b13d1471e23 (diff) | |
parent | 8017900e7f536663153451ff788d8662427782ed (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r-- | indra/newview/llpanelplaces.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 00ac34efa5..46262832dc 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -91,11 +91,18 @@ public: LLParcelHandler() : LLCommandHandler("parcel", UNTRUSTED_THROTTLE) { } bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) - { + { if (params.size() < 2) { return false; } + + if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePlaceProfile")) + { + LLNotificationsUtil::add("NoPlaceInfo", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + LLUUID parcel_id; if (!parcel_id.set(params[0], FALSE)) { |