Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -69,6 +69,7 @@ · 68 unmodified lines | |||
| 69 | #include <EntityScriptClient.h> | 69 | #include <EntityScriptClient.h> |
| 70 | #include <EntityScriptServerLogClient.h> | 70 | #include <EntityScriptServerLogClient.h> |
| 71 | #include <EntityScriptingInterface.h> | 71 | #include <EntityScriptingInterface.h> |
| 72 | #include <HoverOverlayInterface.h> | ||
| 72 | #include <ErrorDialog.h> | 73 | #include <ErrorDialog.h> |
| 73 | #include <FileScriptingInterface.h> | 74 | #include <FileScriptingInterface.h> |
| 74 | #include <Finally.h> | 75 | #include <Finally.h> |
| @@ -588,6 +589,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 513 unmodified lines | |||
| 588 | DependencyManager::set<Snapshot>(); | 589 | DependencyManager::set<Snapshot>(); |
| 589 | DependencyManager::set<CloseEventSender>(); | 590 | DependencyManager::set<CloseEventSender>(); |
| 590 | DependencyManager::set<ResourceManager>(); | 591 | DependencyManager::set<ResourceManager>(); |
| 592 | DependencyManager::set<HoverOverlayInterface>(); | ||
| 591 | 593 | ||
| 592 | return previousSessionCrashed; | 594 | return previousSessionCrashed; |
| 593 | } | 595 | } |
| @@ -1514,6 +1516,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 920 unmodified lines | |||
| 1514 | properties["atp_mapping_requests"] = atpMappingRequests; | 1516 | properties["atp_mapping_requests"] = atpMappingRequests; |
| 1515 | 1517 | ||
| 1516 | properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false; | 1518 | properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false; |
| 1519 | |||
| 1520 | QJsonObject bytesDownloaded; | ||
| 1521 | bytesDownloaded["atp"] = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toInt(); | ||
| 1522 | bytesDownloaded["http"] = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toInt(); | ||
| 1523 | bytesDownloaded["file"] = statTracker->getStat(STAT_FILE_RESOURCE_TOTAL_BYTES).toInt(); | ||
| 1524 | bytesDownloaded["total"] = bytesDownloaded["atp"].toInt() + bytesDownloaded["http"].toInt() | ||
| 1525 | + bytesDownloaded["file"].toInt(); | ||
| 1526 | properties["bytesDownloaded"] = bytesDownloaded; | ||
| 1517 | 1527 | ||
| 1518 | auto myAvatar = getMyAvatar(); | 1528 | auto myAvatar = getMyAvatar(); |
| 1519 | glm::vec3 avatarPosition = myAvatar->getPosition(); | 1529 | glm::vec3 avatarPosition = myAvatar->getPosition(); |