From 1fd2a3c24f424db7445db733f1f79d437d7a6f27 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 11 Aug 2017 12:12:59 -0400
Subject: MAINT-7641: Warn user if s/he directly runs viewer without launcher.

---
 indra/newview/llappviewer.cpp                        | 8 ++++++++
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5a0cdd4f1a..b39528544f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1101,6 +1101,14 @@ bool LLAppViewer::init()
 		}
 	}
 
+	char* PARENT = getenv("PARENT");
+	if (! (PARENT && std::string(PARENT) == "SL_Launcher"))
+	{
+		// Don't directly run this executable. Please run the launcher, which
+		// will run the viewer itself.
+		LLNotificationsUtil::add("RunLauncher");
+	}
+
 #if LL_WINDOWS
 	if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion())
 	{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4db272ba3f..b3acf40876 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1758,6 +1758,13 @@ Visit [_URL] for more information?
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="RunLauncher"
+   type="alertmodal">
+Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OldGPUDriver"
-- 
cgit v1.2.3