merge

1 files changed, 3 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index e0338a319..3fffd69fd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using System.Windows;
-using Tango.BL.ActionLogs;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
 using Tango.Logging;
@@ -71,19 +69,9 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Unregister<IDispatcherProvider>();
             TangoIOC.Default.Unregister<IFirmwareUpgrader>();
             TangoIOC.Default.Unregister<MachineStudioWebClient>();
-            TangoIOC.Default.Unregister<IActionLogManager>();
 
 
-
-            if (App.StartupArgs.Contains("-webDebug"))
-            {
-                TangoIOC.Default.Register<MachineStudioWebClient, MachineStudioWebClient>(new MachineStudioWebClient("http://localhost:1111", null));
-            }
-            else
-            {
-                TangoIOC.Default.Register<MachineStudioWebClient, MachineStudioWebClient>(new MachineStudioWebClient());
-            }
-
+            TangoIOC.Default.Register<MachineStudioWebClient, MachineStudioWebClient>(new MachineStudioWebClient());
             TangoIOC.Default.Register<IDispatcherProvider, DefaultDispatcherProvider>(new DefaultDispatcherProvider(Application.Current.Dispatcher));
             TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
@@ -95,9 +83,8 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
             TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
             TangoIOC.Default.Register<IFirmwareUpgrader, DefaultFirmwareUpgrader>();
-            TangoIOC.Default.Register<IActionLogManager, DefaultActionLogManager>(new DefaultActionLogManager() { IsAsync = true });
-            TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "pyulwgs7m3v7pizz3oxusypdkdfw43txggo5mjwu2ouyv2qwprhq"));
-
+            TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
+            
 
             TangoIOC.Default.Register<MainViewVM>();
             TangoIOC.Default.Register<LoadingViewVM>();