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

commit fc209c292a6877d1e91f6afc2a1679f6ccf958a5
Author: James Baicoianu 
Date:   Mon Jul 13 11:38:04 2020 -0700

    Portal default scale fixes

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -1121,8 +1121,14 @@ elation.require([
             var linkurl = (args.url.match(/^(https?:)?\/\//) || this.getTranslator(args.url) ? args.url : this.baseurl + args.url);
             objectargs.url = linkurl;
           }
-          objectargs.size = objectargs.scale;
-          objectargs.scale = new THREE.Vector3(1,1,1);
+          let scale = objectargs.scale,
+              size = objectargs.size;
+          if (size) {
+            objectargs.size = size;
+          } else if (scale && !(scale.x == 1 && scale.y == 1 && scale.z == 1)) {
+            objectargs.size = scale;
+            objectargs.scale = new THREE.Vector3(1,1,1);
+          }
           break;
         case 'janusimage':
           objectargs.image_id = args.id;

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