From a97cb67dcfa2b058d9db31960837d78e559a9a21 Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Tue, 13 Nov 2018 18:24:36 -0800
Subject: [PATCH] Suggestions based on PR feedback
---
src/react-components/profile-entry-panel.js | 6 ++----
src/scene-entry-manager.js | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/react-components/profile-entry-panel.js b/src/react-components/profile-entry-panel.js
index 18df90851..ba81fc53b 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 9e0794152..1f8e87d60 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 });
--
GitLab