summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-02-02 02:55:32 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-02-02 02:55:32 +0200
commit350d2c5d7a14d0401e80321ac57b2449a8b523a5 (patch)
tree94cf21ed4eb6a068b94556e3c822b5bbf4ce3f17 /indra/newview/llstartup.cpp
parent94daedaaedd3eceb8cf41a2238ee10fe6280f37c (diff)
SL-14769 Allow to log-in, even if there's an inventory error
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp11
1 files changed, 2 insertions, 9 deletions
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();