diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-06 23:03:32 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-06 23:03:32 +0300 |
| commit | 3fcc1739663f939c6c67415f1d56b64c35a52a38 (patch) | |
| tree | 4909e076d5056cf51df1ac20e926c063c3e187cd | |
| parent | f655bb1f27fa637ef1889f8bb83bb0d74d645059 (diff) | |
Resolved merge conflict with SL-13587
| -rw-r--r-- | indra/newview/llpanelprofileclassifieds.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llpanelprofilepicks.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp index 7cc9406e08..4bc104c421 100644 --- a/indra/newview/llpanelprofileclassifieds.cpp +++ b/indra/newview/llpanelprofileclassifieds.cpp @@ -47,6 +47,7 @@ #include "llparcel.h" #include "llregistry.h" #include "llscrollcontainer.h" +#include "llstartup.h" #include "llstatusbar.h" #include "lltabcontainer.h" #include "lltexteditor.h" @@ -82,6 +83,11 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (LLStartUp::getStartupState() < STATE_STARTED) + { + return true; + } + if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableClassifieds")) { LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp index 43a02e2325..52498fdd10 100644 --- a/indra/newview/llpanelprofilepicks.cpp +++ b/indra/newview/llpanelprofilepicks.cpp @@ -41,6 +41,7 @@ #include "llpanelavatar.h" #include "llpanelprofile.h" #include "llparcel.h" +#include "llstartup.h" #include "lltabcontainer.h" #include "lltextbox.h" #include "lltexteditor.h" @@ -65,6 +66,11 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (LLStartUp::getStartupState() < STATE_STARTED) + { + return true; + } + if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnablePicks")) { LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); |