History

Merge branch 'master' of https://github.com/highfidelity/hifi

Stephen Birarda committed 11 years ago

Commit f745dfd2 parents 6d2c87c fead12a38 files · +1020 −1037Browse files

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

Unified · Split

interface/src/Application.cpp+1−0
@@ -3454,6 +3454,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3453 unmodified lines
3454 scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);3454 scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels);
3455 3455
3456 scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());3456 scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());
3457 qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
3457 3458
3458 scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager);3459 scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager);
3459 3460

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