History

Merge remote-tracking branch 'upstream/master' into HEAD

Brad Davis committed 9 years ago

Commit 23653f02 parents a44e8ef c0f44c895 files · +3629 −826Browse files

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

Unified · Split

interface/src/Application.cpp+6−0
@@ -1027,6 +1027,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1026 unmodified lines
1027 1027
1028 // connect to the packet sent signal of the _entityEditSender1028 // connect to the packet sent signal of the _entityEditSender
1029 connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);1029 connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
1030 connect(&_entityEditSender, &EntityEditPacketSender::addingEntityWithCertificate, this, &Application::addingEntityWithCertificate);
1030 1031
1031 const char** constArgv = const_cast<const char**>(argv);1032 const char** constArgv = const_cast<const char**>(argv);
1032 QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads");1033 QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads");
@@ -5752,6 +5753,11 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer · 4719 unmodified lines
5752void Application::packetSent(quint64 length) {5753void Application::packetSent(quint64 length) {
5753}5754}
5754 5755
5756void Application::addingEntityWithCertificate(const QString& certificateID, const QString& placeName) {
5757 auto ledger = DependencyManager::get<Ledger>();
5758 ledger->updateLocation(certificateID, placeName);
5759}
5760
5755void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) {5761void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) {
5756 5762
5757 scriptEngine->setEmitScriptUpdatesFunction([this]() {5763 scriptEngine->setEmitScriptUpdatesFunction([this]() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t