Merging //UE4/Dev-Main @ 4219394 to Dev-Core (//UE4/Dev-Core)

#rb none

[CL 4219497 by Robert Manuszewski in Dev-Core branch]
This commit is contained in:
Robert Manuszewski
2018-07-18 04:32:48 -04:00
parent 4ee340d9b7
commit 4e52bd90b0
48 changed files with 488 additions and 224 deletions
@@ -1,4 +1,4 @@
// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved.
using System;
using System.Collections.Generic;
@@ -35,6 +35,11 @@ namespace AutomationTool
List<KeyValuePair<string, string>> RequiredView = new List<KeyValuePair<string, string>>();
RequiredView.Add(new KeyValuePair<string, string>(DepotPath, "/..."));
if(P4.DoesClientExist(ClientName))
{
P4.DeleteClient(ClientName);
}
P4ClientInfo Client = new P4ClientInfo();
Client.Owner = P4Env.User;
Client.Host = Environment.MachineName;