Merge pull request #1057 from StephenHodgson/MRTK-Dev2017.2-SharingFixesPort

StephenHodgson · web-flow · commit 419968cff779 · 2017-10-02T20:05:16.000-04:00
Mrtk dev2017.2 sharing fixes port
diff --git a/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs b/Assets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs
@@ -62,8 +62,10 @@ public class SharingWorldAnchorManager : WorldAnchorManager
 
         #region Unity Methods
 
-        private void Start()
+        protected override void Start()
         {
+            base.Start();
+
             if (SharingStage.Instance != null)
             {
                 ShowDetailedLogs = SharingStage.Instance.ShowDetailedLogs;
diff --git a/Assets/HoloToolkit/Utilities/Scripts/WorldAnchorManager.cs b/Assets/HoloToolkit/Utilities/Scripts/WorldAnchorManager.cs
@@ -93,7 +93,7 @@ protected override void Awake()
             AnchorStore = null;
         }
 
-        private void Start()
+        protected virtual void Start()
         {
             WorldAnchorStore.GetAsync(AnchorStoreReady);
         }

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ public class SharingWorldAnchorManager : WorldAnchorManager`
`62`	`62`
`63`	`63`	`#region Unity Methods`
`64`	`64`
`65`		`- private void Start()`
	`65`	`+ protected override void Start()`
`66`	`66`	`{`
	`67`	`+ base.Start();`
	`68`	`+`
`67`	`69`	`if (SharingStage.Instance != null)`
`68`	`70`	`{`
`69`	`71`	`ShowDetailedLogs = SharingStage.Instance.ShowDetailedLogs;`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ protected override void Awake()`
`93`	`93`	`AnchorStore = null;`
`94`	`94`	`}`
`95`	`95`
`96`		`- private void Start()`
	`96`	`+ protected virtual void Start()`
`97`	`97`	`{`
`98`	`98`	`WorldAnchorStore.GetAsync(AnchorStoreReady);`
`99`	`99`	`}`