izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging //UE4/Dev-Main to Dev-Geometry (from CL: 3492074)

Browse Source 
#rb none

[CL 3493369 by Mike Fricker in Dev-Geometry branch]
This commit is contained in:
Mike Fricker
2017-06-15 17:45:03 -04:00
parent cb60c57c48
commit fddcdcac09
5884 changed files with 213547 additions and 184356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileSystemModule.cpp
View File

@@ -23,7 +23,7 @@ public:
// INetworkFileSystemModule interface
virtual INetworkFileServer* CreateNetworkFileServer( bool bLoadTargetPlatforms, int32 Port, const FFileRequestDelegate* InFileRequestDelegate, const FRecompileShadersDelegate* InRecompileShadersDelegate, const ENetworkFileServerProtocol Protocol ) const override
virtual INetworkFileServer* CreateNetworkFileServer( bool bLoadTargetPlatforms, int32 Port, FNetworkFileDelegateContainer NetworkFileDelegateContainer, const ENetworkFileServerProtocol Protocol ) const override
{
TArray<ITargetPlatform*> ActiveTargetPlatforms;
if (bLoadTargetPlatforms)
@@ -46,10 +46,10 @@ public:
{
#if ENABLE_HTTP_FOR_NFS
case NFSP_Http:
return new FNetworkFileServerHttp(Port, InFileRequestDelegate, InRecompileShadersDelegate, ActiveTargetPlatforms);
return new FNetworkFileServerHttp(Port, NetworkFileDelegateContainer, ActiveTargetPlatforms);
#endif
case NFSP_Tcp:
return new FNetworkFileServer(Port, InFileRequestDelegate, InRecompileShadersDelegate, ActiveTargetPlatforms);
return new FNetworkFileServer(Port, NetworkFileDelegateContainer, ActiveTargetPlatforms);
}
return NULL;