Unified · Split
| @@ -3594,10 +3594,6 @@ void Application::update(float deltaTime) { · 3593 unmodified lines | ||
| 3594 | 3594 | |
| 3595 | 3595 | int Application::sendNackPackets() { |
| 3596 | 3596 | |
| 3597 | − if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) { | |
| 3598 | − return 0; | |
| 3599 | − } | |
| 3600 | − | |
| 3601 | 3597 | // iterates through all nodes in NodeList |
| 3602 | 3598 | auto nodeList = DependencyManager::get<NodeList>(); |
| 3603 | 3599 | |
| @@ -531,9 +531,6 @@ Menu::Menu() { · 530 unmodified lines | ||
| 531 | 531 | // Developer > Network >>> |
| 532 | 532 | MenuWrapper* networkMenu = developerMenu->addMenu("Network"); |
| 533 | 533 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); |
| 534 | − addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false, | |
| 535 | − qApp->getEntityEditPacketSender(), | |
| 536 | − SLOT(toggleNackPackets())); | |
| 537 | 534 | addCheckableActionToQMenuAndActionHash(networkMenu, |
| 538 | 535 | MenuOption::DisableActivityLogger, |
| 539 | 536 | 0, |
| @@ -84,7 +84,6 @@ namespace MenuOption { · 83 unmodified lines | ||
| 84 | 84 | const QString DisableActivityLogger = "Disable Activity Logger"; |
| 85 | 85 | const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment"; |
| 86 | 86 | const QString DisableLightEntities = "Disable Light Entities"; |
| 87 | − const QString DisableNackPackets = "Disable Entity NACK Packets"; | |
| 88 | 87 | const QString DiskCacheEditor = "Disk Cache Editor"; |
| 89 | 88 | const QString DisplayCrashOptions = "Display Crash Options"; |
| 90 | 89 | const QString DisplayHandTargets = "Show Hand Targets"; |
| @@ -24,9 +24,7 @@ EntityEditPacketSender::EntityEditPacketSender() { · 23 unmodified lines | ||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | void EntityEditPacketSender::processEntityEditNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) { |
| 27 | − if (_shouldProcessNack) { | |
| 28 | − processNackPacket(*message, sendingNode); | |
| 29 | − } | |
| 27 | + processNackPacket(*message, sendingNode); | |
| 30 | 28 | } |
| 31 | 29 | |
| 32 | 30 | void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType type, QByteArray& buffer, qint64 clockSkew) { |
| @@ -36,9 +36,5 @@ public: · 35 unmodified lines | ||
| 36 | 36 | |
| 37 | 37 | public slots: |
| 38 | 38 | void processEntityEditNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode); |
| 39 | − void toggleNackPackets() { _shouldProcessNack = !_shouldProcessNack; } | |
| 40 | − | |
| 41 | −private: | |
| 42 | − bool _shouldProcessNack = true; | |
| 43 | 39 | }; |
| 44 | 40 | #endif // hifi_EntityEditPacketSender_h |