merge conflicts

1 files changed, 12 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 3fffd69fd..25843d1c3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
@@ -71,7 +72,16 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Unregister<MachineStudioWebClient>();
 
 
-            TangoIOC.Default.Register<MachineStudioWebClient, MachineStudioWebClient>(new MachineStudioWebClient());
+
+            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<IDispatcherProvider, DefaultDispatcherProvider>(new DefaultDispatcherProvider(Application.Current.Dispatcher));
             TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
@@ -84,7 +94,7 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
             TangoIOC.Default.Register<IFirmwareUpgrader, DefaultFirmwareUpgrader>();
             TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
-            
+
 
             TangoIOC.Default.Register<MainViewVM>();
             TangoIOC.Default.Register<LoadingViewVM>();