From 777e6c3c2d29165c771a948afd1f6d70c0a478fe Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 27 Aug 2015 15:03:13 -0700 Subject: [PATCH] use existing AssetUploadDialogFactory ref --- interface/src/Menu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 230cfacf7a..abe08f58b2 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -362,8 +362,9 @@ Menu::Menu() { QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu, MenuOption::UploadAsset, 0, - &AssetUploadDialogFactory::getInstance(), + &assetDialogFactory, SLOT(showDialog())); + // disable the asset upload action by default - it gets enabled only if asset server becomes present assetUpload->setEnabled(false);