diff --git a/src/react-components/profile-entry-panel.js b/src/react-components/profile-entry-panel.js index 18df90851d2a5d6a1d923a09a52aba934d8e4ab3..ba81fc53b0a941d8dafa4a330156eb9ff83de6e1 100644 --- a/src/react-components/profile-entry-panel.js +++ b/src/react-components/profile-entry-panel.js @@ -98,9 +98,7 @@ class ProfileEntryPanel extends Component { /> {this.state.customMode ? ( <div className={styles.avatarSelectorContainer}> - <label htmlFor="#custom-avatar-url" className={styles.title}> - Avatar GLTF/GLB{" "} - </label> + <label htmlFor="#custom-avatar-url">Avatar GLTF/GLB </label> <input id="custom-avatar-url" type="url" @@ -132,7 +130,7 @@ class ProfileEntryPanel extends Component { this.setState({ customMode: true, avatarId: avatars.find(a => a.id === this.state.avatarId).model }) } > - options + custom url </a> </div> )} diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js index 9e079415207ce8dbd6be5e864c4b00ef16f72b63..1f8e87d60fae179a802a9cf246cd79f1be09cead 100644 --- a/src/scene-entry-manager.js +++ b/src/scene-entry-manager.js @@ -10,7 +10,7 @@ const isDebug = qsTruthy("debug"); const qs = new URLSearchParams(location.search); const aframeInspectorUrl = require("file-loader?name=assets/js/[name]-[hash].[ext]!aframe-inspector/dist/aframe-inspector.min.js"); -import { addMedia } from "./utils/media-utils"; +import { addMedia, proxiedUrlFor } from "./utils/media-utils"; import { ObjectContentOrigins } from "./object-types"; function requestFullscreen() { @@ -140,7 +140,7 @@ export default class SceneEntryManager { const { avatarId, displayName } = this.store.state.profile; this.playerRig.setAttribute("player-info", { displayName, - avatarSrc: avatarId && avatarId.startsWith("http") ? avatarId : `#${avatarId || "botdefault"}` + avatarSrc: avatarId && avatarId.startsWith("http") ? proxiedUrlFor(avatarId) : `#${avatarId || "botdefault"}` }); const hudController = this.playerRig.querySelector("[hud-controller]"); hudController.setAttribute("hud-controller", { showTip: !this.store.state.activity.hasFoundFreeze });