Anonymous avatar Anonymous committed 4b2421f

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

Comments (0)

Files changed (2)

indra/newview/lllocalbitmaps.cpp

 #include "llagentwearables.h"
 #include "lltexlayerparams.h"
 #include "llvovolume.h"
+#include "llnotificationsutil.h"
 
 /*=======================================*/
 /*  Formal declarations, constants, etc. */
 								<< "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;
 					}
 				}		
 			        << "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;
 		}
 	}

indra/newview/skins/default/xui/en/notifications.xml

 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>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.