# Conflicts: # scripts/system/audio.js
Showing the changes to interface/src/Application.cpp (1 of 98 files). Show all
Unified · Split
| @@ -869,10 +869,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 868 unmodified lines | |||
| 869 | // connect to the packet sent signal of the _entityEditSender | 869 | // connect to the packet sent signal of the _entityEditSender |
| 870 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); | 870 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); |
| 871 | 871 | ||
| 872 | // send the identity packet for our avatar each second to our avatar mixer | ||
| 873 | connect(&identityPacketTimer, &QTimer::timeout, myAvatar.get(), &MyAvatar::sendIdentityPacket); | ||
| 874 | identityPacketTimer.start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS); | ||
| 875 | |||
| 876 | const char** constArgv = const_cast<const char**>(argv); | 872 | const char** constArgv = const_cast<const char**>(argv); |
| 877 | QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads"); | 873 | QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads"); |
| 878 | bool success; | 874 | bool success; |
| @@ -3111,7 +3107,10 @@ void Application::mousePressEvent(QMouseEvent* event) { · 2232 unmodified lines | |||
| 3111 | 3107 | ||
| 3112 | if (!_aboutToQuit) { | 3108 | if (!_aboutToQuit) { |
| 3113 | getOverlays().mousePressEvent(&mappedEvent); | 3109 | getOverlays().mousePressEvent(&mappedEvent); |
| 3114 | getEntities()->mousePressEvent(&mappedEvent); | 3110 | |
| 3111 | if (!_controllerScriptingInterface->areEntityClicksCaptured()) { | ||
| 3112 | getEntities()->mousePressEvent(&mappedEvent); | ||
| 3113 | } | ||
| 3115 | } | 3114 | } |
| 3116 | 3115 | ||
| 3117 | _controllerScriptingInterface->emitMousePressEvent(&mappedEvent); // send events to any registered scripts | 3116 | _controllerScriptingInterface->emitMousePressEvent(&mappedEvent); // send events to any registered scripts |