Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
David Kelly 2017-03-16 13:19:42 -07:00
commit 140ef736ee
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/NameCard.qml
View file

@ -27,7 +27,7 @@ Item {
// Properties // Properties
property string profileUrl: ""; property string profileUrl: "";
property string defaultBaseUrl: location.metaverseServerUrl; property string defaultBaseUrl: AddressManager.metaverseServerUrl;
property string connectionStatus : "" property string connectionStatus : ""
property string uuid: "" property string uuid: ""
property string displayName: "" property string displayName: ""

1
interface/src/Application.cpp
View file

@ -2011,7 +2011,6 @@ void Application::initializeUi() {
rootContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data()); rootContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
rootContext->setContextProperty("Render", _renderEngine->getConfiguration().get()); rootContext->setContextProperty("Render", _renderEngine->getConfiguration().get());
rootContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface()); rootContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface());
rootContext->setContextProperty("location", DependencyManager::get<AddressManager>().data());
rootContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor()); rootContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());