From 171aebd6aa77b4e5bc818fe79bb2aa44cfd81121 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Thu, 28 Mar 2019 13:04:16 -0700
Subject: [PATCH 1/2] Remove disabling of --url for Android.

---
 interface/src/Application.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 47f3b774b2..c1489c3265 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3722,14 +3722,11 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // If this is a first run we short-circuit the address passed in
     if (_firstRun.get()) {
-#if !defined(Q_OS_ANDROID)
        DependencyManager::get<AddressManager>()->goToEntry();
        sentTo = SENT_TO_ENTRY;
-#endif
         _firstRun.set(false);
 
     } else {
-#if !defined(Q_OS_ANDROID)
         QString goingTo = "";
         if (addressLookupString.isEmpty()) {
             if (Menu::getInstance()->isOptionChecked(MenuOption::HomeLocation)) {
@@ -3743,7 +3740,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(!goingTo.isEmpty() ? goingTo : addressLookupString);
         DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
         sentTo = SENT_TO_PREVIOUS_LOCATION;
-#endif
     }
 
     UserActivityLogger::getInstance().logAction("startup_sent_to", {

From 782b8f5da6f4f16fec4b03da6436e86f3a9dbf23 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 2 Apr 2019 13:26:50 -0700
Subject: [PATCH 2/2] Case 22010: Bump protocol number to fix joint order
 mismatch

The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
---
 libraries/networking/src/udt/PacketHeaders.cpp | 4 ++--
 libraries/networking/src/udt/PacketHeaders.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 7f20f881da..e527e660b3 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -38,10 +38,10 @@ PacketVersion versionForPacketType(PacketType packetType) {
             return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums);
         case PacketType::AvatarIdentity:
         case PacketType::AvatarData:
-            return static_cast<PacketVersion>(AvatarMixerPacketVersion::SendMaxTranslationDimension);
+            return static_cast<PacketVersion>(AvatarMixerPacketVersion::FBXJointOrderChange);
         case PacketType::BulkAvatarData:
         case PacketType::KillAvatar:
-            return static_cast<PacketVersion>(AvatarMixerPacketVersion::SendMaxTranslationDimension);
+            return static_cast<PacketVersion>(AvatarMixerPacketVersion::FBXJointOrderChange);
         case PacketType::MessagesData:
             return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData);
         // ICE packets
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 8c76a3ebd0..780e3d8546 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -328,7 +328,8 @@ enum class AvatarMixerPacketVersion : PacketVersion {
     CollisionFlag,
     AvatarTraitsAck,
     FasterAvatarEntities,
-    SendMaxTranslationDimension
+    SendMaxTranslationDimension,
+    FBXJointOrderChange
 };
 
 enum class DomainConnectRequestVersion : PacketVersion {