Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 21 insertions, 0 deletions

diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
index bda625564b..dac87d2a10 100644
--- a/indra/newview/llfloaterobjectweights.h
+++ b/indra/newview/llfloaterobjectweights.h
@@ -61,13 +61,17 @@ public:
     bool postBuild() override;
 
     void onOpen(const LLSD& key) override;
+    void onClose(bool app_quitting) override;
 
     void onWeightsUpdate(const SelectionCost& selection_cost) override;
     void setErrorStatus(S32 status, const std::string& reason) override;
 
     void draw() override;
 
+    static void onIdleRefresh(void* user_data);
+
     void updateLandImpacts(const LLParcel* parcel);
+    void refreshDataFromSelection();
     void refresh() override;
 
 private:
@@ -76,9 +80,19 @@ private:
     void toggleWeightsLoadingIndicators(bool visible);
     void toggleLandImpactsLoadingIndicators(bool visible);
     void toggleRenderLoadingIndicators(bool visible);
+    void toggleLODLoadingIndicators(bool visible);
 
     void updateIfNothingSelected();
 
+    bool            mWeightsDirty;
+    bool            mSelectionDirty;
+    bool            mSelectionMeshDirty;
+    F64             mSelectionRefreshTime;
+    S32             mSelectionLastLOD;
+    S32             mSelectionLastTris;
+    F32             mSelectionLastArea;
+    S32             mLastActiveLODRequests;
+
     LLTextBox       *mSelectedObjects;
     LLTextBox       *mSelectedPrims;
 
@@ -95,6 +109,13 @@ private:
     LLTextBox       *mLodLevel;
     LLTextBox       *mTrianglesShown;
     LLTextBox       *mPixelArea;
+
+    LLTextBox       *mHighLodTris;
+    LLTextBox       *mMediumLodTris;
+    LLTextBox       *mLowLodTris;
+    LLTextBox       *mLowestLodTris;
+
+    boost::signals2::scoped_connection mSelectionConnection;
 };
 
 #endif //LL_LLFLOATEROBJECTWEIGHTS_H