From 9f9214e808df300810b2eb7b610262caa137656e Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 1 Mar 2018 09:33:48 -0800
Subject: [PATCH] getting back the RC65 version for a few files

---
 interface/resources/qml/Stats.qml             |  6 +---
 interface/src/ui/Stats.cpp                    | 31 +------------------
 interface/src/ui/Stats.h                      |  2 --
 .../system/libraries/entitySelectionTool.js   |  5 ++-
 4 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index a12bd4b2c0..4626d9bcda 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -257,11 +257,7 @@ Item {
                     id: octreeCol
                     spacing: 4; x: 4; y: 4;
                     StatText {
-                        text: "Render Engine: " + root.engineFrameTime.toFixed(1) + " ms"
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: root.renderEngineStats
+                        text: "Engine: " + root.engineFrameTime.toFixed(1) + " ms"
                     }
                     StatText {
                         text: "Batch: " + root.batchFrameTime.toFixed(1) + " ms"
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index ff42ed09e7..80f57bfe0e 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -482,7 +482,7 @@ void Stats::updateStats(bool force) {
             float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
             _gameUpdateStats = QString("/idle/update = %1 ms").arg(dt);
 
-            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "pickManager", "postUpdateLambdas", "misc" };
+            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "misc" };
             for (int32_t j = 0; j < categories.size(); ++j) {
                 QString recordKey = "/idle/update/" + categories[j];
                 itr = allRecords.find(recordKey);
@@ -502,39 +502,10 @@ void Stats::updateStats(bool force) {
             _gameUpdateStats = "";
             emit gameUpdateStatsChanged();
         }
-
-        itr = allRecords.find("/paintGL/display/EngineRun/Engine");
-        std::priority_queue<SortableStat> renderEngineStats;
-        if (itr != allRecords.end()) {
-            float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
-            _renderEngineStats = QString("/render = %1 ms").arg(dt);
-
-            QVector<QString> categories = { "RenderMainView", "SecondaryCameraJob", "UpdateScene"};
-            for (int32_t j = 0; j < categories.size(); ++j) {
-                QString recordKey = "/paintGL/display/EngineRun/Engine/" + categories[j];
-                itr = allRecords.find(recordKey);
-                if (itr != allRecords.end()) {
-                    float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
-                    QString message = QString("\n    %1 = %2").arg(categories[j]).arg(dt);
-                    renderEngineStats.push(SortableStat(message, dt));
-                }
-            }
-            while (!renderEngineStats.empty()) {
-                SortableStat stat = renderEngineStats.top();
-                _renderEngineStats += stat.message;
-                renderEngineStats.pop();
-            }
-            emit renderEngineStatsChanged();
-        } else if (_renderEngineStats != "") {
-            _renderEngineStats = "";
-            emit renderEngineStatsChanged();
-        }
     } else if (_showGameUpdateStats) {
         _showGameUpdateStats = false;
         _gameUpdateStats = "";
-        _renderEngineStats = "";
         emit gameUpdateStatsChanged();
-        emit renderEngineStatsChanged();
     }
 }
 
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index e5fc0beaf6..af3189f20b 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -106,7 +106,6 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(QString, lodStatus, QString())
     STATS_PROPERTY(QString, timingStats, QString())
     STATS_PROPERTY(QString, gameUpdateStats, QString())
-    STATS_PROPERTY(QString, renderEngineStats, QString())
     STATS_PROPERTY(int, serverElements, 0)
     STATS_PROPERTY(int, serverInternal, 0)
     STATS_PROPERTY(int, serverLeaves, 0)
@@ -240,7 +239,6 @@ signals:
     void localLeavesChanged();
     void timingStatsChanged();
     void gameUpdateStatsChanged();
-    void renderEngineStatsChanged();
     void glContextSwapchainMemoryChanged();
     void qmlTextureMemoryChanged();
     void texturePendingTransfersChanged();
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index a419e9d49c..8a07ff0d20 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1322,9 +1322,8 @@ SelectionDisplay = (function() {
                                        isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
                                        isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
 
-        var showOutlineForZone = (SelectionManager.selections.length === 1 && 
-                                    typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
-                                    SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
+        var showOutlineForZone = (SelectionManager.selections.length === 1 &&
+                                  SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
         that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
                                                               !isActiveTool(handleRotateYawRing) &&
                                                               !isActiveTool(handleRotateRollRing)));