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"));