Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
Ansariel
commit
3af3ecbf79
|
|
@ -838,9 +838,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>9fad2e6e1fb3c698afa2b9094deb8422</string>
|
||||
<string>b92c2efe8e3802a26209a4ebe2f840ba</string>
|
||||
<key>url</key>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.6.4.202005232231_81.3.3_g072a5f5_chromium-81.0.4044.147-linux64-201442030.tar.bz2</string>
|
||||
<string>http://downloads.phoenixviewer.com/dullahan-1.6.4.202005241618_81.3.10_gb223419_chromium-81.0.4044.138-linux64-201451417.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>linux64</string>
|
||||
|
|
|
|||
|
|
@ -120,9 +120,6 @@ MediaPluginBase(host_send_func, host_user_data)
|
|||
mPluginsEnabled = false;
|
||||
mJavascriptEnabled = true;
|
||||
mDisableGPU = false;
|
||||
#ifdef LL_LINUX // <FS:ND> Do not use GPU on Linux, using GPU messes with some window managers (https://bitbucket.org/NickyD/phoenix-firestorm-lgpl-linux/commits/14c936db5a02cf0f3ff24eb7f1c92136#comment-6048984)
|
||||
mDisableGPU = true;
|
||||
#endif
|
||||
mUserAgentSubtring = "";
|
||||
mAuthUsername = "";
|
||||
mAuthPassword = "";
|
||||
|
|
|
|||
|
|
@ -157,8 +157,9 @@ namespace
|
|||
sBugSplatSender->setDefaultUserEmail( WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " (" << ADDRESS_SIZE << "-bit, flavor " << flavor <<")")));
|
||||
// </FS:ND>
|
||||
|
||||
//<FS:ND/> Clear out username first, as we get some crashes that has the OS set as username, let's see if this fixes it.
|
||||
sBugSplatSender->setDefaultUserName( WCSTR("<unset>") );
|
||||
//<FS:ND/> Clear out username first, as we get some crashes that has the OS set as username, let's see if this fixes it. Use Crash.Linden as a usr can never have a "Linden"
|
||||
// name and on the other hand a Linden will not likely ever crash on Firestom.
|
||||
sBugSplatSender->setDefaultUserName( WCSTR("Crash.Linden") );
|
||||
|
||||
// <FS:ND> Only send avatar name if enabled via prefs
|
||||
if (gCrashSettings.getBOOL("CrashSubmitName"))
|
||||
|
|
@ -679,6 +680,7 @@ LLAppViewerWin32::~LLAppViewerWin32()
|
|||
|
||||
bool LLAppViewerWin32::init()
|
||||
{
|
||||
bool success{ false }; // <FS:ND/> For BugSplat we need to call base::init() early on or there's no access to settings.
|
||||
// Platform specific initialization.
|
||||
|
||||
// Turn off Windows Error Reporting
|
||||
|
|
@ -702,7 +704,21 @@ bool LLAppViewerWin32::init()
|
|||
|
||||
#else // LL_BUGSPLAT
|
||||
#pragma message("Building with BugSplat")
|
||||
// <FS:ND> Pre BugSplat dance, make sure settings are valid, query crash behavior and then set up Bugsplat accordingly"
|
||||
success = LLAppViewer::init();
|
||||
if (!success)
|
||||
return false;
|
||||
|
||||
S32 nCrashSubmitBehavior = gCrashSettings.getS32("CrashSubmitBehavior");
|
||||
// Don't ever send? bail out!
|
||||
if (nCrashSubmitBehavior == 2 /*CRASH_BEHAVIOR_NEVER_SEND*/)
|
||||
return success;
|
||||
|
||||
DWORD dwAsk{ MDSF_NONINTERACTIVE };
|
||||
if (nCrashSubmitBehavior == 0 /*CRASH_BEHAVIOR_ASK*/)
|
||||
dwAsk = 0;
|
||||
// </FS:ND>
|
||||
|
||||
std::string build_data_fname(
|
||||
gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json"));
|
||||
// Use llifstream instead of std::ifstream because LL_PATH_EXECUTABLE
|
||||
|
|
@ -740,13 +756,26 @@ bool LLAppViewerWin32::init()
|
|||
LL_VIEWER_VERSION_BUILD));
|
||||
|
||||
// have to convert normal wide strings to strings of __wchar_t
|
||||
|
||||
// <FS:ND> Set up Bugsplat to ask or always send
|
||||
|
||||
// sBugSplatSender = new MiniDmpSender(
|
||||
// WCSTR(BugSplat_DB.asString()),
|
||||
// WCSTR(LL_TO_WSTRING(LL_VIEWER_CHANNEL)),
|
||||
// WCSTR(version_string),
|
||||
// nullptr, // szAppIdentifier -- set later
|
||||
// MDSF_NONINTERACTIVE | // automatically submit report without prompting
|
||||
// MDSF_PREVENTHIJACKING); // disallow swiping Exception filter
|
||||
|
||||
sBugSplatSender = new MiniDmpSender(
|
||||
WCSTR(BugSplat_DB.asString()),
|
||||
WCSTR(LL_TO_WSTRING(LL_VIEWER_CHANNEL)),
|
||||
WCSTR(version_string),
|
||||
nullptr, // szAppIdentifier -- set later
|
||||
MDSF_NONINTERACTIVE | // automatically submit report without prompting
|
||||
dwAsk |
|
||||
MDSF_PREVENTHIJACKING); // disallow swiping Exception filter
|
||||
// </FS:ND>
|
||||
|
||||
sBugSplatSender->setCallback(bugsplatSendLog);
|
||||
|
||||
// engage stringize() overload that converts from wstring
|
||||
|
|
@ -759,7 +788,12 @@ bool LLAppViewerWin32::init()
|
|||
#endif // LL_BUGSPLAT
|
||||
#endif // LL_SEND_CRASH_REPORTS
|
||||
|
||||
bool success = LLAppViewer::init();
|
||||
// <FS:ND> base::init() was potentially called earlier.
|
||||
// bool success = LLAppViewer::init();
|
||||
// </FS:ND>
|
||||
|
||||
if( !success )
|
||||
success = LLAppViewer::init();
|
||||
|
||||
return success;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4871,13 +4871,6 @@ void LLPanelPreferenceCrashReports::refresh()
|
|||
getChild<LLUICtrl>("checkSendCrashReportsAlwaysAsk")->setEnabled(fEnable);
|
||||
getChild<LLUICtrl>("checkSendSettings")->setEnabled(fEnable);
|
||||
getChild<LLUICtrl>("checkSendName")->setEnabled(fEnable);
|
||||
|
||||
// <FS:ND> Disable options not available when compiling with Bugsplat and set those to default values.
|
||||
#ifdef LL_BUGSPLAT
|
||||
getChild<LLUICtrl>("checkSendCrashReportsAlwaysAsk")->setEnabled(false);
|
||||
getChild<LLUICtrl>("checkSendCrashReportsAlwaysAsk")->setValue(false);
|
||||
#endif
|
||||
// </FS:ND>
|
||||
}
|
||||
|
||||
void LLPanelPreferenceCrashReports::apply()
|
||||
|
|
|
|||
Loading…
Reference in New Issue