repo: janusweb
action: commit
revision: 
path_from: 
revision_from: cf942fcccb28fe4348837117fdc0f89a0f5120ce:
path_to: 
revision_to: 

commit cf942fcccb28fe4348837117fdc0f89a0f5120ce
Merge: bf0af25 10392e6
Author: epoch 
Date:   Tue Oct 22 04:23:22 2024 +0000

    merged dumb stuff

diff --cc media/assets/webui/apps/settings/settings.js
index 7e5ce52c3a58f869449c348fa73d9b135016ed7c,bf56556dd02d0025a71c154056923044be943952..eaa5a41e68f8d8af52b2c50f9c8d6d3a114bad64
--- a/media/assets/webui/apps/settings/settings.js
+++ b/media/assets/webui/apps/settings/settings.js
@@@ -147,8 -147,8 +147,8 @@@ elation.elements.define('janus.username
    create() {
      this.elements = elation.elements.fromString(`
        

-         
+         
 -        
 +        
        
      `, this);
      this.elements.usernameform.addEventListener('submit', ev => this.handleFormSubmit(ev));
diff --cc scripts/elements/outliner.js
index 26cbf4bc69709231fc72af3b5b1785fa0d008778,3b67dcd66716261e0b499bad619f15500f42d71c..460dd73c16e2514128c6ab237e4425795b874b0b
--- a/scripts/elements/outliner.js
+++ b/scripts/elements/outliner.js
@@@ -68,17 -68,32 +68,33 @@@ elation.require(['janusweb.janusbase']
        }
      },
      select(object) {
 +      if(!object) return;
        this.selected = object;
+       if (!this.meshes) return;
+       if (!object) {
+         this.deselect();
+         return;
+       }
        let objmeshes = [], skinnedmeshes = [];
-       object.traverseObjects(n => {
-         if (n instanceof THREE.Mesh && n.material !== this.outlinematerial) {
-           if (n.isSkinnedMesh)
-             skinnedmeshes.push(n);
-           else
-             objmeshes.push(n);
-         }
-       });
+       if (object instanceof THREE.Object3D) {
+         object.traverse(n => {
+           if (n instanceof THREE.Mesh && n.material !== this.outlinematerial) {
+             if (n.isSkinnedMesh)
+               skinnedmeshes.push(n);
+             else
+               objmeshes.push(n);
+           }
+         });
+       } else {
+         object.traverseObjects(n => {
+           if (n instanceof THREE.Mesh && n.material !== this.outlinematerial) {
+             if (n.isSkinnedMesh)
+               skinnedmeshes.push(n);
+             else
+               objmeshes.push(n);
+           }
+         });
+       }
        // Create and update regular Meshes
        let meshIdx = 0;
        for (; meshIdx < objmeshes.length; meshIdx++) {
diff --cc scripts/multiplayermanager.js
index 10922147ff77cffd27f66c7dac4f84de8097e306,331245fc4dbafaec0a9e2fefeb7bfe475182b463..84fe1317729b840e3fb2c3fd2639b055d3fdd008
--- a/scripts/multiplayermanager.js
+++ b/scripts/multiplayermanager.js
@@@ -103,10 -103,7 +103,10 @@@ elation.require(['janusweb.external.Jan
      }
      this.getServerForRoom = function(room) {
        var serverurl = this.getServerURLForRoom(room, true);
 +      if (serverurl == "undefined" ) {
 +        serverurl="wss://thebackupbox.net/~epoch/janus/presence.cgi?URL-IS-A-STRING-OF-UNDEFINED.SMH."
 +      }
-       if (serverurl && !this.servers[serverurl]) {
+       if (serverurl && !this.servers[serverurl] && !room.private) {
          var server = new JanusClientConnection({
            host: serverurl,
            userId: this.janusweb.userId,

-----END OF PAGE-----