Merge pull request #4379 from secondlife/release/2025.06

Release/2025.06

1 files changed, 13 insertions, 6 deletions

diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
index 3b999f6b9b..bda625564b 100644
--- a/indra/newview/llfloaterobjectweights.h
+++ b/indra/newview/llfloaterobjectweights.h
@@ -58,21 +58,24 @@ public:
     LLFloaterObjectWeights(const LLSD& key);
     ~LLFloaterObjectWeights();
 
-    /*virtual*/ bool postBuild();
+    bool postBuild() override;
 
-    /*virtual*/ void onOpen(const LLSD& key);
+    void onOpen(const LLSD& key) override;
 
-    /*virtual*/ void onWeightsUpdate(const SelectionCost& selection_cost);
-    /*virtual*/ void setErrorStatus(S32 status, const std::string& reason);
+    void onWeightsUpdate(const SelectionCost& selection_cost) override;
+    void setErrorStatus(S32 status, const std::string& reason) override;
+
+    void draw() override;
 
     void updateLandImpacts(const LLParcel* parcel);
-    void refresh();
+    void refresh() override;
 
 private:
-    /*virtual*/ void generateTransactionID();
+    void generateTransactionID() override;
 
     void toggleWeightsLoadingIndicators(bool visible);
     void toggleLandImpactsLoadingIndicators(bool visible);
+    void toggleRenderLoadingIndicators(bool visible);
 
     void updateIfNothingSelected();
 
@@ -88,6 +91,10 @@ private:
     LLTextBox       *mRezzedOnLand;
     LLTextBox       *mRemainingCapacity;
     LLTextBox       *mTotalCapacity;
+
+    LLTextBox       *mLodLevel;
+    LLTextBox       *mTrianglesShown;
+    LLTextBox       *mPixelArea;
 };
 
 #endif //LL_LLFLOATEROBJECTWEIGHTS_H