History

move contextoverlay connection to contextoverlayinterface

SamGondelman committed 9 years ago

Commit c4e6cb21 parent 5bfb0ba4 files · +9 −25Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+3−1
@@ -682,7 +682,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 681 unmodified lines
682 DependencyManager::set<CloseEventSender>();682 DependencyManager::set<CloseEventSender>();
683 DependencyManager::set<ResourceManager>();683 DependencyManager::set<ResourceManager>();
684 DependencyManager::set<SelectionScriptingInterface>();684 DependencyManager::set<SelectionScriptingInterface>();
685 DependencyManager::set<ContextOverlayInterface>();
686 DependencyManager::set<Ledger>();685 DependencyManager::set<Ledger>();
687 DependencyManager::set<Wallet>();686 DependencyManager::set<Wallet>();
688 DependencyManager::set<WalletScriptingInterface>();687 DependencyManager::set<WalletScriptingInterface>();
@@ -1173,7 +1172,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 484 unmodified lines
1173 // allow you to move an entity around in your hand1172 // allow you to move an entity around in your hand
1174 _entityEditSender.setPacketsPerSecond(3000); // super high!!1173 _entityEditSender.setPacketsPerSecond(3000); // super high!!
1175 1174
1175 // Overlays need to exist before we set the ContextOverlayInterface dependency
1176 _overlays.init(); // do this before scripts load1176 _overlays.init(); // do this before scripts load
1177 DependencyManager::set<ContextOverlayInterface>();
1178
1177 // Make sure we don't time out during slow operations at startup1179 // Make sure we don't time out during slow operations at startup
1178 updateHeartbeat();1180 updateHeartbeat();
1179 1181