Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -214,7 +214,6 @@ Setting::Handle<int> maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTRE · 213 unmodified lines | |||
| 214 | static const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; | 214 | static const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; |
| 215 | 215 | ||
| 216 | const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions { | 216 | const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions { |
| 217 | { SNAPSHOT_EXTENSION, &Application::acceptSnapshot }, | ||
| 218 | { SVO_EXTENSION, &Application::importSVOFromURL }, | 217 | { SVO_EXTENSION, &Application::importSVOFromURL }, |
| 219 | { SVO_JSON_EXTENSION, &Application::importSVOFromURL }, | 218 | { SVO_JSON_EXTENSION, &Application::importSVOFromURL }, |
| 220 | { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl }, | 219 | { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl }, |
| @@ -2857,6 +2856,8 @@ void Application::dragEnterEvent(QDragEnterEvent* event) { · 2636 unmodified lines | |||
| 2857 | event->acceptProposedAction(); | 2856 | event->acceptProposedAction(); |
| 2858 | } | 2857 | } |
| 2859 | 2858 | ||
| 2859 | // This is currently not used, but could be invoked if the user wants to go to the place embedded in an | ||
| 2860 | // Interface-taken snapshot. (It was developed for drag and drop, before we had asset-server loading or in-world browsers.) | ||
| 2860 | bool Application::acceptSnapshot(const QString& urlString) { | 2861 | bool Application::acceptSnapshot(const QString& urlString) { |
| 2861 | QUrl url(urlString); | 2862 | QUrl url(urlString); |
| 2862 | QString snapshotPath = url.toLocalFile(); | 2863 | QString snapshotPath = url.toLocalFile(); |