From 4a21eaa33fbf7a305a0275958e9d98053388faa5 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 30 Dec 2016 15:18:01 -0800
Subject: [PATCH] Cleanup before PR
---
assignment-client/src/avatars/AvatarMixer.cpp | 2 +-
interface/resources/qml/hifi/Pal.qml | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 43ad2cbaff..30ce210eb6 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -368,7 +368,7 @@ void AvatarMixer::broadcastAvatarData() {
AvatarDataSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(otherNode->getUUID());
AvatarDataSequenceNumber lastSeqFromSender = otherNodeData->getLastReceivedSequenceNumber();
-
+
if (lastSeqToReceiver > lastSeqFromSender && lastSeqToReceiver != UINT16_MAX) {
// we got out out of order packets from the sender, track it
otherNodeData->incrementNumOutOfOrderSends();
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 366e0ab30d..2196692e1c 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -244,18 +244,6 @@ Item {
}
}
}
- // Separator between user and admin functions
- Rectangle {
- // Size
- width: 2
- height: table.height
- // Anchors
- anchors.left: adminTab.left
- anchors.top: table.top
- // Properties
- visible: iAmAdmin
- color: hifi.colors.lightGrayText
- }
// Refresh button
Rectangle {
// Size
@@ -295,6 +283,18 @@ Item {
onExited: reloadButton.color = (pressed ? hifi.colors.lightGrayText: hifi.colors.darkGray)
}
}
+ // Separator between user and admin functions
+ Rectangle {
+ // Size
+ width: 2
+ height: table.height
+ // Anchors
+ anchors.left: adminTab.left
+ anchors.top: table.top
+ // Properties
+ visible: iAmAdmin
+ color: hifi.colors.lightGrayText
+ }
// This Rectangle refers to the [?] popup button
Rectangle {
color: hifi.colors.tableBackgroundLight