From 4ff8067aa8f5117fa83e1a971b5bbc0c8fc033b2 Mon Sep 17 00:00:00 2001
From: Vaalith Jinn <none@none>
Date: Mon, 9 Apr 2012 17:44:27 +0300
Subject: STORM-64: Added toasts to display critical errors during update
 cycle.

---
 indra/newview/lllocalbitmaps.cpp                     | 10 ++++++++++
 indra/newview/skins/default/xui/en/notifications.xml | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index b96fc06226..10c3b20f63 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -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;
 		}
 	}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..e9175e2390 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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>
-- 
cgit v1.2.3