Showing the changes to interface/src/Menu.cpp (1 of 10 files). Show all
Unified · Split
| @@ -24,6 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #include "Application.h" |
| 26 | 26 | #include "AccountManager.h" |
| 27 | +#include "assets/ATPAssetMigrator.h" | |
| 27 | 28 | #include "audio/AudioScope.h" |
| 28 | 29 | #include "avatar/AvatarManager.h" |
| 29 | 30 | #include "devices/DdeFaceTracker.h" |
| @@ -354,7 +355,7 @@ Menu::Menu() { · 324 unmodified lines | ||
| 354 | 355 | MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets"); |
| 355 | 356 | |
| 356 | 357 | auto& assetDialogFactory = AssetUploadDialogFactory::getInstance(); |
| 357 | − assetDialogFactory.setParent(this); | |
| 358 | + assetDialogFactory.setDialogParent(this); | |
| 358 | 359 | |
| 359 | 360 | QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu, |
| 360 | 361 | MenuOption::UploadAsset, |
| @@ -365,6 +366,13 @@ Menu::Menu() { · 4 unmodified lines | ||
| 365 | 366 | // disable the asset upload action by default - it gets enabled only if asset server becomes present |
| 366 | 367 | assetUpload->setEnabled(false); |
| 367 | 368 | |
| 369 | + auto& atpMigrator = ATPAssetMigrator::getInstance(); | |
| 370 | + atpMigrator.setDialogParent(this); | |
| 371 | + | |
| 372 | + QAction* assetMigration = addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::AssetMigration, | |
| 373 | + 0, &atpMigrator, | |
| 374 | + SLOT(loadEntityServerFile())); | |
| 375 | + | |
| 368 | 376 | MenuWrapper* avatarDebugMenu = developerMenu->addMenu("Avatar"); |
| 369 | 377 | |
| 370 | 378 | MenuWrapper* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking"); |