merge fix

interface/src/avatar/AvatarManager.cpp

@@ -837,7 +837,7 @@ void AvatarManager::setAvatarSortCoefficient(const QString& name, const QScriptV
     }
 }
 
-QVariantMap AvatarManager::getPalData(const QList<QString> specificAvatarIdentifiers) {
+QVariantMap AvatarManager::getPalData(const QStringList& specificAvatarIdentifiers) {
     QJsonArray palData;
 
     auto avatarMap = getHashCopy();

interface/src/avatar/AvatarManager.h

@@ -184,11 +184,11 @@ public:
      * than iterating over each avatar and obtaining data about them in JavaScript, as that method
      * locks and unlocks each avatar's data structure potentially hundreds of times per update tick.
      * @function AvatarManager.getPalData
-     * @param {string[]} [specificAvatarIdentifiers] - A list of specific Avatar Identifiers about
+     * @param {string[]} [specificAvatarIdentifiers=[]] - The list of IDs of the avatars you want the PAL data for.
-     * which you want to get PAL data
+     * If an empty list, the PAL data for all nearby avatars is returned.
-     * @returns {object}
+     * @returns {object[]} An array of objects, each object being the PAL data for an avatar.
      */
-    Q_INVOKABLE QVariantMap getPalData(const QList<QString> specificAvatarIdentifiers = QList<QString>());
+    Q_INVOKABLE QVariantMap getPalData(const QStringList& specificAvatarIdentifiers = QStringList());
 
     float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
     int getIdentityRequestsSent() const { return _identityRequestsSent; }

scripts/system/html/css/edit-style.css

@@ -1565,104 +1565,6 @@ input.rename-entity {
     margin-top: 5px;
 }
 
-.container {
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: space-around;
-    margin-bottom: 8px;
-    min-height: 28px;
-}
-
-.container > label {
-    margin-top: 6px;
-    width: 200px;
-}
-
-.container > div.checkbox {
-    padding-top: 6px;
-}
-
-.container > .value {
-    width: 100%;
-}
-
-.container .row {
-    display: flex;
-    flex-flow: row nowrap;
-}
-
-.container.shrink {
-    width: min-content;
-}
-
-.fstuple {
-    display: flex;
-    flex-flow: row;
-}
-.fstuple label {
-    position: relative;
-    left: 10px;
-}
-.fstuple label.red, .fstuple label.x {
-    color: #C62147;
-}
-.fstuple label.green, .fstuple label.y {
-    color: #359D85;
-}
-.fstuple label.blue, .fstuple label.z {
-    color: #0093C5;
-}
-
-.xyz.fstuple, .pyr.fstuple {
-    position: relative;
-    left: -19px;
-}
-
-.rgb.fstuple .tuple {
-    display: none;
-}
-
-input.number-slider {
-    background: #575757;
-    border-radius: 4px;
-    color: white;
-}
-
-.fstuple > div {
-    display: flex;
-    align-items: center;
-    justify-content: left;
-}
-
-.flex-row {
-    display: flex;
-    flex-flow: row;
-}
-
-.flex-column {
-    display: flex;
-    flex-flow: column;
-}
-
-.flex-center {
-    align-items: center;
-}
-
-.flex-evenly-spaced {
-    flex: 1;
-}
-
-#property-serverScripts-status {
-    font-family: Raleway-Light;
-    font-size: 14px;
-    margin: 6px 0;
-}
-
-#property-name, #property-id {
-    display: flex;
-    width: 100%;
-}
-
 #toggle-space-mode::before {
     font-family: HiFi-Glyphs;
     font-size: 20px;

scripts/system/html/js/entityProperties.js

@@ -1116,7 +1116,6 @@ const GROUPS = [
             },
             {
                 label: "Clone Lifetime",
-                indentedLabel: true,
                 type: "number",
                 unit: "s",
                 propertyID: "cloneLifetime",
@@ -1124,21 +1123,18 @@ const GROUPS = [
             },
             {
                 label: "Clone Limit",
-                indentedLabel: true,
                 type: "number",
                 propertyID: "cloneLimit",
                 showPropertyRule: { "cloneable": "true" },
             },
             {
                 label: "Clone Dynamic",
-                indentedLabel: true,
                 type: "bool",
                 propertyID: "cloneDynamic",
                 showPropertyRule: { "cloneable": "true" },
             },
             {
                 label: "Clone Avatar Entity",
-                indentedLabel: true,
                 type: "bool",
                 propertyID: "cloneAvatarEntity",
                 showPropertyRule: { "cloneable": "true" },
@@ -2193,7 +2189,7 @@ function createProperty(propertyData, propertyElementID, propertyName, propertyI
         }
         default: {
             console.log("EntityProperties - Unknown property type " + 
-                propertyType + " set to property " + propertyID);
+						propertyType + " set to property " + propertyID);
             break;
         }
     }