Skip to content

Commit 4449c3c

Browse files
Merge pull request #2869 from StephenHodgson/vNEXT-Diagnostics
a few more diagnostics changes
2 parents 4598c39 + 3373c17 commit 4449c3c

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

Assets/MixedRealityToolkit-SDK/Features/Diagnostics/DiagnosticsHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
4+
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Diagnostics;
55
using Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics;
66
using System;
77
using System.Text;

Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4+
using Microsoft.MixedReality.Toolkit.Core.Definitions;
45
using Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics;
56
using Microsoft.MixedReality.Toolkit.Core.Managers;
67
using UnityEditor;
@@ -42,6 +43,11 @@ public override void OnInspectorGUI()
4243
Selection.activeObject = MixedRealityManager.Instance.ActiveProfile;
4344
}
4445

46+
if (MixedRealityPreferences.LockProfiles && !((BaseMixedRealityProfile)target).IsCustomProfile)
47+
{
48+
GUI.enabled = false;
49+
}
50+
4551
EditorGUILayout.Space();
4652
EditorGUILayout.LabelField("Diagnostic Visualization Options", EditorStyles.boldLabel);
4753
EditorGUILayout.HelpBox("Diagnostic visualizations can help monitor system resources and performance inside an application.", MessageType.Info);

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)