summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-08-11 15:22:21 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-08-11 15:22:21 -0400
commit87a582a02c439149b24f2554fb416aa5dedda0e2 (patch)
treee954a28ce82b3236a2fc093699965f400e2fc40e
parent1fd2a3c24f424db7445db733f1f79d437d7a6f27 (diff)
MAINT-7641: Indent new RunLauncher notification per code review.
-rw-r--r--indra/newview/llappviewer.cpp5
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b39528544f..10cd58476a 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1106,6 +1106,11 @@ bool LLAppViewer::init()
{
// Don't directly run this executable. Please run the launcher, which
// will run the viewer itself.
+ // Naturally we do not consider this bulletproof. The point is to
+ // gently remind a user who *inadvertently* finds him/herself in this
+ // situation to do things the Right Way. Anyone who intentionally
+ // bypasses this mechanism needs no reminder that s/he's shooting
+ // him/herself in the foot.
LLNotificationsUtil::add("RunLauncher");
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b3acf40876..1a7c9229a3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1762,7 +1762,7 @@ Visit [_URL] for more information?
icon="alertmodal.tga"
name="RunLauncher"
type="alertmodal">
-Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead.
+ Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead.
</notification>
<notification