Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680

#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
This commit is contained in:
jack porter
2019-01-24 20:39:08 -05:00
parent 9d4a292d5f
commit 2bbc43bc53
8687 changed files with 1060230 additions and 285280 deletions

View File

@@ -98,7 +98,12 @@ var UE_JavascriptLibrary = {
UE_GetCurrentCultureName: function (address, outsize) {
var culture_name = navigator.language || navigator.browserLanguage;
if (culture_name.lenght >= outsize)
// TODO(kainino0x): on a pthread, navigator.language isn't available.
if (!culture_name) {
console.warn("UE_GetCurrentCultureName: navigator.language unavailable on pthread; falling back to 'en-US'");
culture_name = 'en-US';
}
if (culture_name.length >= outsize)
return 0;
Module.writeAsciiToMemory(culture_name, address);
return 1;
@@ -377,6 +382,10 @@ var UE_JavascriptLibrary = {
},
UE_BrowserWebGLVersion: function() {
if ( ENVIRONMENT_IS_WORKER )
{ // worker threads do not have access to emscripten's Module object
return 2; // TODO: EMSCRITPEN_TOOLCHAIN_UPGRADE_CHECK - remove hard coded value...
}
return Module['WEBGL_VERSION'];
}
};