3 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 53da9826ed..3941b82e75 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -38,7 +38,6 @@
 #include "llappviewer.h"
 #include "llsceneview.h"
 #include "llviewertexture.h"
-#include "llfloaterreg.h"
 #include "llscenemonitor.h"
 //
 // Globals
@@ -53,7 +52,6 @@ static LLDefaultChildRegistry::Register<LLDebugView> r("debug_view");
 
 LLDebugView::LLDebugView(const LLDebugView::Params& p)
 :   LLView(p),
-    mFastTimerView(NULL),
     mDebugConsolep(NULL),
     mFloaterSnapRegion(NULL)
 {}
@@ -89,8 +87,6 @@ void LLDebugView::init()
     r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),
                                      (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
 
-    mFastTimerView = dynamic_cast<LLFastTimerView*>(LLFloaterReg::getInstance("block_timers"));
-
     gSceneView = new LLSceneView(r);
     gSceneView->setFollowsTop();
     gSceneView->setFollowsLeft();
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h
index 8fa2acc3c9..ca274d6f91 100644
--- a/indra/newview/lldebugview.h
+++ b/indra/newview/lldebugview.h
@@ -59,7 +59,6 @@ public:
 
     void setStatsVisible(bool visible);
 
-    LLFastTimerView* mFastTimerView;
     LLConsole*       mDebugConsolep;
     LLView*          mFloaterSnapRegion;
 };
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 187b2248de..8b9aad4641 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3589,6 +3589,12 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
 
         LL_INFOS(LOG_INV) << "Inventory saved: " << (S32)cat_count << " categories, " << (S32)it_count << " items." << LL_ENDL;
     }
+    catch(std::bad_alloc&)
+    {
+        // We are quiting, so just log an error and move on.
+        LL_WARNS(LOG_INV) << "Failed to save inventory to cache due to memory allocation failure." << LL_ENDL;
+        return false;
+    }
     catch (...)
     {
         LOG_UNHANDLED_EXCEPTION("");