commit merge

2 files changed, 7 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
index 9bee35697..81d3f4243 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
@@ -27,6 +27,11 @@ namespace Tango.MachineStudio.UI.ViewModels
         public ExternalBridgeLoginIntent Intent { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to require safety level operations permission from the remote machine.
+        /// </summary>
+        public bool RequireSafetyOperations { get; set; }
+
+        /// <summary>
         /// Gets or sets the login command.
         /// </summary>
         public RelayCommand<String> LoginCommand { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 46491c823..0e02d779f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -598,6 +598,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                         Password = config.Password,
                         UserGuid = AuthenticationProvider.CurrentUser.Guid,
                         Intent = config.Intent,
+                        UserName = AuthenticationProvider.CurrentUser.Contact.FullName,
+                        RequireSafetyLevelOperations = config.RequireSafetyOperations
                     });
 
                     _reconnectionMachine = machine;