From 3fcc1739663f939c6c67415f1d56b64c35a52a38 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 6 May 2021 23:03:32 +0300
Subject: Resolved merge conflict with SL-13587

---
 indra/newview/llpanelprofilepicks.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llpanelprofilepicks.cpp')

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"));
-- 
cgit v1.3