From 350d2c5d7a14d0401e80321ac57b2449a8b523a5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 2 Feb 2022 02:55:32 +0200
Subject: SL-14769 Allow to log-in, even if there's an inventory error

---
 indra/newview/llstartup.cpp                          | 11 ++---------
 indra/newview/skins/default/xui/en/notifications.xml |  5 +----
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d9ebd73da4..79ef0c075e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -309,13 +309,6 @@ void update_texture_fetch()
 	gTextureList.updateImages(0.10f);
 }
 
-bool finish_force_quit(const LLSD& notification, const LLSD& response)
-{
-	LLAppViewer::instance()->forceQuit();
-	return false;
-}
-
-
 void set_flags_and_update_appearance()
 {
 	LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true);
@@ -1835,10 +1828,10 @@ bool idle_startup()
 		// a usable state and gInventory.isInventoryUsable() will be
 		// true.
 
-		// if inventory is unusable, we need to bail out.
+		// if inventory is unusable, show warning.
 		if (!gInventory.isInventoryUsable())
 		{
-			LLNotificationsUtil::add("InventoryUnusable", LLSD(), LLSD(), &finish_force_quit );
+			LLNotificationsUtil::add("InventoryUnusable");
 		}
 		
 		gInventory.createCommonSystemCategories();
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4063626d8c..2007abefd7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2964,11 +2964,8 @@ Darn. You have been logged out of [SECOND_LIFE].
    icon="alertmodal.tga"
    name="InventoryUnusable"
    type="alertmodal">
-There is a problem with your inventory. First, try logging out and logging in again. If you see this message again, contact Support and ask them to correct the problem.
+There was a problem loading your inventory. First, try logging out and logging in again. If you see this message again, contact Support to correct the problem.
     <tag>fail</tag>
-    <usetemplate
-     name="okbutton"
-     yestext="Log out"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3