Merge pull request siemens#317 from berkayalpcakal/WebSocketNetDebug

MartinBischoff · web-flow · commit d3f6497a69ac · 2020-06-08T07:24:13.000+02:00
Changed default protocol to WebSocketSharp in urdf import transfer window
diff --git a/Unity3D/Assets/RosSharp/Scripts/RosBridgeClient/Editor/UrdfTransfer/TransferFromRosEditorWindow.cs b/Unity3D/Assets/RosSharp/Scripts/RosBridgeClient/Editor/UrdfTransfer/TransferFromRosEditorWindow.cs
@@ -159,7 +159,7 @@ private void DeleteEditorPrefs()
         private void GetEditorPrefs()
         {
             protocolType = (Protocols.Protocol)(EditorPrefs.HasKey("UrdfImporterProtocolNumber") ?
-                EditorPrefs.GetInt("UrdfImporterProtocolNumber") : 1);
+                EditorPrefs.GetInt("UrdfImporterProtocolNumber") : 0);
 
             address = (EditorPrefs.HasKey("UrdfImporterAddress") ?
                 EditorPrefs.GetString("UrdfImporterAddress") :

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ private void DeleteEditorPrefs()`
`159`	`159`	`private void GetEditorPrefs()`
`160`	`160`	`{`
`161`	`161`	`protocolType = (Protocols.Protocol)(EditorPrefs.HasKey("UrdfImporterProtocolNumber") ?`
`162`		`- EditorPrefs.GetInt("UrdfImporterProtocolNumber") : 1);`
	`162`	`+ EditorPrefs.GetInt("UrdfImporterProtocolNumber") : 0);`
`163`	`163`
`164`	`164`	`address = (EditorPrefs.HasKey("UrdfImporterAddress") ?`
`165`	`165`	`EditorPrefs.GetString("UrdfImporterAddress") :`