Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -331,7 +331,6 @@ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStanda · 330 unmodified lines | |||
| 331 | Setting::Handle<int> maxOctreePacketsPerSecond{"maxOctreePPS", DEFAULT_MAX_OCTREE_PPS}; | 331 | Setting::Handle<int> maxOctreePacketsPerSecond{"maxOctreePPS", DEFAULT_MAX_OCTREE_PPS}; |
| 332 | 332 | ||
| 333 | Setting::Handle<bool> loginDialogPoppedUp{"loginDialogPoppedUp", false}; | 333 | Setting::Handle<bool> loginDialogPoppedUp{"loginDialogPoppedUp", false}; |
| 334 | static const QUrl OVERLAY_LOGIN_DIALOG_URL(PathUtils::qmlUrl("OverlayLoginDialog.qml")); | ||
| 335 | 334 | ||
| 336 | static const QString STANDARD_TO_ACTION_MAPPING_NAME = "Standard to Action"; | 335 | static const QString STANDARD_TO_ACTION_MAPPING_NAME = "Standard to Action"; |
| 337 | static const QString NO_MOVEMENT_MAPPING_NAME = "Standard to Action (No Movement)"; | 336 | static const QString NO_MOVEMENT_MAPPING_NAME = "Standard to Action (No Movement)"; |
| @@ -8634,7 +8633,7 @@ void Application::createLoginDialogOverlay() { · 8296 unmodified lines | |||
| 8634 | auto overlayPosition = (cameraPosition + offset) + (upVec * OVERLAY_OFFSET.y); | 8633 | auto overlayPosition = (cameraPosition + offset) + (upVec * OVERLAY_OFFSET.y); |
| 8635 | QVariantMap overlayProperties = { | 8634 | QVariantMap overlayProperties = { |
| 8636 | { "name", "LoginDialogOverlay" }, | 8635 | { "name", "LoginDialogOverlay" }, |
| 8637 | { "url", OVERLAY_LOGIN_DIALOG_URL }, | 8636 | { "url", OVERLAY_LOGIN_DIALOG }, |
| 8638 | { "position", vec3toVariant(overlayPosition) }, | 8637 | { "position", vec3toVariant(overlayPosition) }, |
| 8639 | { "orientation", quatToVariant(cameraOrientation) }, | 8638 | { "orientation", quatToVariant(cameraOrientation) }, |
| 8640 | { "isSolid", true }, | 8639 | { "isSolid", true }, |