livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7641: Warn user if s/he directly runs viewer without launcher.

meow-7.2.2
Nat Goodspeed 2017-08-11 12:12:59 -04:00
parent e6e088d5ab
commit 1fd2a3c24f
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -3150,9 +3150,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>01b463520b0f253842335428901404ae</string>
<string>333a679f0a492e060b4586eaa1a38a56</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7371/27810/viewer_manager-1.0.507360-darwin64-507360.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7692/29540/viewer_manager-1.0.507681-darwin64-507681.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -3174,9 +3174,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2f8626ce0448d56ecfd07e51affadcfd</string>
<string>bf4672af39013418d721327d337ba1a0</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7372/27832/viewer_manager-1.0.507360-windows-507360.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7694/29546/viewer_manager-1.0.507681-windows-507681.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -3187,7 +3187,7 @@
<key>source_type</key>
<string>hg</string>
<key>version</key>
<string>1.0.507360</string>
<string>1.0.507681</string>
</map>
<key>vlc-bin</key>
<map>

8
indra/newview/llappviewer.cpp
View File

@ -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())
{

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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"