From ac7f7366cd8147f7826c6d59584c96ecf6115c61 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sun, 5 Aug 2012 08:47:49 -0400
Subject: [PATCH] Remove jarring viewer log spam message -- unless it's true.
For as long as I've been paying attention to viewer logs, every run has
always stated -- in all-caps, no less! : NOTE: ALL NOTIFICATIONS THAT OCCUR
WILL GET ADDED TO IGNORE LIST FOR LATER RUNS. I have always found that
unsettling, having little desire to automatically ignore notifications --
especially not whatever random set happens to manifest during a particular
run. However, over time I've learned that it seems to have no actual impact.
I've wondered (not too hard) what it actually *does* mean -- but generally
I'm looking at a viewer log because I'm in hot pursuit of some quite
different problem. Stumbling across the source for this message today in
LLViewerWindow::LLViewerWindow, I was shocked -- shocked! -- to find it was
being produced unconditionally! Therefore it has heretofore been utterly
meaningless log spam. It provided no additional information whatsoever to
anyone reading a log -- only that vague sense of unease. Make this
conditional on gSavedSettings.getBOOL("IgnoreAllNotifications"), which would
appear to be the original intent. Now its presence (or absence) actually says
something about internal conditions in the viewer.
---
indra/newview/llviewerwindow.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index af2eec9ba89..1798d554b9f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1555,8 +1555,12 @@ LLViewerWindow::LLViewerWindow(const Params& p)
LLNotifications::instance().getChannel("VW_alerts")->connectChanged(&LLViewerWindow::onAlert);
LLNotifications::instance().getChannel("VW_alertmodal")->connectChanged(&LLViewerWindow::onAlert);
- LLNotifications::instance().setIgnoreAllNotifications(gSavedSettings.getBOOL("IgnoreAllNotifications"));
- llinfos << "NOTE: ALL NOTIFICATIONS THAT OCCUR WILL GET ADDED TO IGNORE LIST FOR LATER RUNS." << llendl;
+ bool ignore = gSavedSettings.getBOOL("IgnoreAllNotifications");
+ LLNotifications::instance().setIgnoreAllNotifications(ignore);
+ if (ignore)
+ {
+ llinfos << "NOTE: ALL NOTIFICATIONS THAT OCCUR WILL GET ADDED TO IGNORE LIST FOR LATER RUNS." << llendl;
+ }
// Default to application directory.
LLViewerWindow::sSnapshotBaseName = "Snapshot";
--
GitLab