merge

3 files changed, 1 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index c00caf72a..97ff894df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -273,8 +273,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                         _settings.LastLoginPassword = RememberMe ? cryptographer.Encrypt(Password) : null;
                         _settings.Save();
 
-                        _eventLogger.Log("User logged in.");
-
                         EnableSlotSelection = false;
 
                         IsLogging = false;
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 7584617ed..9bee35697 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
@@ -41,7 +41,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         public MachineLoginViewVM()
         {
-            Intent = ExternalBridgeLoginIntent.FullControl;
+            Intent = ExternalBridgeLoginIntent.Diagnostics;
             LoginCommand = new RelayCommand<string>(Login);
             CancelCommand = new RelayCommand(Cancel);
         }
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 2a00386dc..4d37321dd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -410,13 +410,11 @@ namespace Tango.MachineStudio.UI.ViewModels
                     String serial = ApplicationManager.ConnectedMachine.SerialNumber;
                     await ApplicationManager.ConnectedMachine.Disconnect();
                     ApplicationManager.SetConnectedMachine(null);
-                    _eventLogger.Log("Disconnected from machine " + serial);
 
                     PostMessage(new MachineConnectionChangedMessage() { Machine = null });
                 }
                 catch (Exception ex)
                 {
-                    _eventLogger.Log(ex, "Error disconnecting from machine.");
                     LogManager.Log(ex, "Could not disconnect from machine.");
                 }
                 finally
@@ -497,7 +495,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                                             ApplicationManager.SetConnectedMachine(x.SelectedMachine);
 
                                             PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine });
-                                            _eventLogger.Log(String.Format("Successfully connected to machine {0} via USB", x.SelectedMachine.SerialNumber));
                                             _settings.LastVirtualMachineSerialNumber = vm.SelectedMachine.SerialNumber;
                                             _settings.Save();
 
@@ -510,11 +507,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                                         {
                                             LogManager.Log(ex);
 
-                                            if (x.SelectedMachine != null)
-                                            {
-                                                _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber);
-                                            }
-
                                             _notificationProvider.ShowError("Could not connect to the selected machine." + Environment.NewLine + ex.Message);
 
                                         }
@@ -615,7 +607,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                     machine.SessionClosed -= Machine_SessionClosed;
                     machine.SessionClosed += Machine_SessionClosed;
                     PostMessage(new MachineConnectionChangedMessage() { Machine = machine });
-                    _eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", machine.SerialNumber));
 
                     //if (x.UploadHardwareConfiguration)
                     //{
@@ -626,13 +617,11 @@ namespace Tango.MachineStudio.UI.ViewModels
                 catch (ResponseErrorException ex)
                 {
                     LogManager.Log(ex);
-                    _eventLogger.Log(ex, "Error connecting to machine " + machine.SerialNumber);
                     _notificationProvider.ShowError("Could not connect to the selected machine." + Environment.NewLine + ex.Container.ErrorMessage);
                 }
                 catch (Exception ex)
                 {
                     LogManager.Log(ex);
-                    _eventLogger.Log(ex, "Error connecting to machine " + machine.SerialNumber);
                     _notificationProvider.ShowError("Could not connect to the selected machine." + Environment.NewLine + ex.Message);
                 }