livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14769 Allow to log-in, even if there's an inventory error

master
Mnikolenko Productengine 2022-02-02 02:55:32 +02:00
parent 94daedaaed
commit 350d2c5d7a
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llstartup.cpp
View File

@ -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();

5
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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