Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-30 20:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use location.metaverseServerUrl instead of hardcoded value.

Browse source
This commit is contained in:
howard-stearns 2017-03-15 16:33:23 -07:00
parent f662571cab
commit 84fd17bd88
3 changed files with 4 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: "http://highfidelity.com"; property string defaultBaseUrl: location.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,6 +2011,7 @@ 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());

3
scripts/system/pal.js
View file

@ -299,7 +299,8 @@ function updateUser(data) {
// User management services // User management services
// //
// These are prototype versions that will be changed when the back end changes. // These are prototype versions that will be changed when the back end changes.
var METAVERSE_BASE = 'https://metaverse.highfidelity.com'; var METAVERSE_BASE = location.metaverseServerUrl;
function request(url, callback) { // cb(error, responseOfCorrectContentType) of url. General for 'get' text/html/json, but without redirects. function request(url, callback) { // cb(error, responseOfCorrectContentType) of url. General for 'get' text/html/json, but without redirects.
var httpRequest = new XMLHttpRequest(); var httpRequest = new XMLHttpRequest();