Merge pull request #1081 from keveleigh/MergingMaster

Merging master into Dev branch

Author: StephenHodgson

Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs

@@ -12,8 +12,9 @@ public class ManualIpConfiguration : MonoBehaviour
     {
         /// <summary>
         /// The maximum length of characters in a IPv4 address.
+        /// <remarks>000.000.000.000</remarks>
         /// </summary>
-        private const int MaximumCharacterLength = 12;
+        private const int MaximumCharacterLength = 15;
 
         public string IpAddress { get { return ipAddress.text; } }
 

Assets/HoloToolkit/Utilities/Scripts/WorldAnchorManager.cs

@@ -178,7 +178,7 @@ private void Anchor_OnTrackingChanged(WorldAnchor anchor, bool located)
         /// If no anchor name is provided, the name of the anchor will be the same as the GameObject.
         /// </summary>
         /// <param name="gameObjectToAnchor">The GameObject to attach the anchor to.</param>
-        /// <param name="anchorName">Name of the anchor.  If none provided a GUID is generated for you.</param>
+        /// <param name="anchorName">Name of the anchor.  If none provided, the name of the GameObject will be used.</param>
         /// <returns>The name of the newly attached anchor.</returns>
         public string AttachAnchor(GameObject gameObjectToAnchor, string anchorName = null)
         {
@@ -198,7 +198,7 @@ public string AttachAnchor(GameObject gameObjectToAnchor, string anchorName = nu
                 Debug.LogWarning("[WorldAnchorManager] AttachAnchor called before anchor store is ready.");
             }
 
-            anchorName = string.IsNullOrEmpty(anchorName) ? anchorName : gameObjectToAnchor.name;
+            anchorName = string.IsNullOrEmpty(anchorName) ? gameObjectToAnchor.name : anchorName;
 
             LocalAnchorOperations.Enqueue(
                 new AnchorAttachmentInfo

ProjectSettings/ProjectSettings.asset

@@ -590,7 +590,7 @@ PlayerSettings:
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 0
   apiCompatibilityLevelPerPlatform:
-    Metro: 1
+    Metro: 3
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: MixedRealityToolkit-Unity