From d1d183e190b58205d811a507bf0c10ecd06d9df6 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Wed, 25 Mar 2015 13:05:10 -0600 Subject: [PATCH] More .com changes --- domain-server/resources/describe-settings.json | 4 ++-- domain-server/resources/web/js/settings.js | 6 +++--- examples/edit.js | 2 +- examples/libraries/modelUploader.js | 6 +++--- examples/lobby.js | 2 +- examples/users.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 4636c61367..0082bd84ae 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -6,7 +6,7 @@ { "name": "access_token", "label": "Access Token", - "help": "This is an access token generated on the My Security page of your High Fidelity account.
Generate a token with the 'domains' scope and paste it here.
This is required to associate this domain-server with a domain in your account." + "help": "This is an access token generated on the My Security page of your High Fidelity account.
Generate a token with the 'domains' scope and paste it here.
This is required to associate this domain-server with a domain in your account." }, { "name": "id", @@ -30,7 +30,7 @@ }, { "value": "disabled", - "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.io" + "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com" } ] }, diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index f62515c863..4fac753959 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -652,7 +652,7 @@ function chooseFromHighFidelityDomains(clickedButton) { clickedButton.attr('disabled', 'disabled') // get a list of user domains from data-web - data_web_domains_url = "https://metaverse.highfidelity.io/api/v1/domains?access_token=" + data_web_domains_url = "https://metaverse.highfidelity.com/api/v1/domains?access_token=" $.getJSON(data_web_domains_url + Settings.initialValues.metaverse.access_token, function(data){ modal_buttons = { @@ -682,7 +682,7 @@ function chooseFromHighFidelityDomains(clickedButton) { modal_buttons["success"] = { label: 'Create new domain', callback: function() { - window.open("https://metaverse.highfidelity.io/user/domains", '_blank'); + window.open("https://metaverse.highfidelity.com/user/domains", '_blank'); } } modal_body = "

You do not have any domains in your High Fidelity account." + @@ -708,4 +708,4 @@ function chooseFromHighFidelityDomains(clickedButton) { title: "Access token required" }) } -} \ No newline at end of file +} diff --git a/examples/edit.js b/examples/edit.js index 72938e5ed4..70e51823b2 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -130,7 +130,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", { visible: false, }); -var MARKETPLACE_URL = "https://metaverse.highfidelity.io/marketplace"; +var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; var marketplaceWindow = new WebWindow('Marketplace', MARKETPLACE_URL, 900, 700, false); marketplaceWindow.setVisible(false); diff --git a/examples/libraries/modelUploader.js b/examples/libraries/modelUploader.js index fcc96854ab..64a9e91203 100644 --- a/examples/libraries/modelUploader.js +++ b/examples/libraries/modelUploader.js @@ -21,8 +21,8 @@ modelUploader = (function () { //svoBuffer, mapping, geometry, - API_URL = "https://metaverse.highfidelity.io/api/v1/models", - MODEL_URL = "http://public.highfidelity.io/models/content", + API_URL = "https://metaverse.highfidelity.com/api/v1/models", + MODEL_URL = "http://public.highfidelity.com/models/content", NAME_FIELD = "name", SCALE_FIELD = "scale", FILENAME_FIELD = "filename", @@ -690,4 +690,4 @@ modelUploader = (function () { }; return that; -}()); \ No newline at end of file +}()); diff --git a/examples/lobby.js b/examples/lobby.js index 5d687dc07a..381107d65a 100644 --- a/examples/lobby.js +++ b/examples/lobby.js @@ -158,7 +158,7 @@ var places = {}; function changeLobbyTextures() { var req = new XMLHttpRequest(); - req.open("GET", "https://metaverse.highfidelity.io/api/v1/places?limit=21", false); + req.open("GET", "https://metaverse.highfidelity.com/api/v1/places?limit=21", false); req.send(); places = JSON.parse(req.responseText).data.places; diff --git a/examples/users.js b/examples/users.js index dec141127e..22fe89389f 100644 --- a/examples/users.js +++ b/examples/users.js @@ -34,7 +34,7 @@ var usersWindow = (function () { usersOnline, // Raw users data linesOfUsers = [], // Array of indexes pointing into usersOnline - API_URL = "https://metaverse.highfidelity.io/api/v1/users?status=online", + API_URL = "https://metaverse.highfidelity.com/api/v1/users?status=online", HTTP_GET_TIMEOUT = 60000, // ms = 1 minute usersRequest, processUsers,