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

STORM-64: Added toasts to display critical errors during update cycle.

master
Vaalith Jinn 2012-04-09 17:44:27 +03:00
parent 0539de9099
commit 4ff8067aa8
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/lllocalbitmaps.cpp
View File

@ -59,6 +59,7 @@
#include "llagentwearables.h"
#include "lltexlayerparams.h"
#include "llvovolume.h"
#include "llnotificationsutil.h"
/*=======================================*/
/* Formal declarations, constants, etc. */
@ -234,6 +235,11 @@ bool LLLocalBitmap::updateSelf(bool first_update)
<< "Filename: " << mFilename << "\n"
<< "Disabling further update attempts for this file." << llendl;
LLSD notif_args;
notif_args["FNAME"] = mFilename;
notif_args["NRETRIES"] = LL_LOCAL_UPDATE_RETRIES;
LLNotificationsUtil::add("LocalBitmapsUpdateFailedFinal", notif_args);
mLinkStatus = LS_BROKEN;
}
}
@ -247,6 +253,10 @@ bool LLLocalBitmap::updateSelf(bool first_update)
<< "Filename: " << mFilename << "\n"
<< "Disabling further update attempts for this file." << llendl;
LLSD notif_args;
notif_args["FNAME"] = mFilename;
LLNotificationsUtil::add("LocalBitmapsUpdateFileNotFound", notif_args);
mLinkStatus = LS_BROKEN;
}
}

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

@ -7696,4 +7696,22 @@ Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
You died and have been teleported to your home location.
</global>
<notification
icon="alertmodal.tga"
name="LocalBitmapsUpdateFileNotFound"
persist="true"
type="notify">
[FNAME] could not be updated because the file could no longer be found.
Disabling future updates for this file.
</notification>
<notification
icon="alertmodal.tga"
name="LocalBitmapsUpdateFailedFinal"
persist="true"
type="notify">
[FNAME] could not be opened or decoded for [NRETRIES] attempts, and is now considered broken.
Disabling future updates for this file.
</notification>
</notifications>