Merge pull request #4379 from secondlife/release/2025.06

Release/2025.06

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 5d23dc8d8e..20e5b2666a 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -73,7 +73,8 @@ public:
     /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true);
 
     void initModelPreview();
-    static bool showModelPreview();
+    void setUploadDestination(const LLUUID& dest_folder) { mDestinationFolderId = dest_folder; }
+    static void showModelPreview(const LLUUID& dest_folder = LLUUID::null);
 
     bool handleMouseDown(S32 x, S32 y, MASK mask);
     bool handleMouseUp(S32 x, S32 y, MASK mask);
@@ -164,9 +165,6 @@ protected:
 
     static void onPhysicsBrowse(LLUICtrl* ctrl, void* userdata);
     static void onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsOptimize(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsDecomposeBack(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsSimplifyBack(LLUICtrl* ctrl, void* userdata);
 
     void            draw();
 
@@ -208,7 +206,7 @@ private:
     void onClickCalculateBtn();
     void onJointListSelection();
 
-    void onLoDSourceCommit(S32 lod, bool refresh_ui);
+    void onLoDSourceCommit(S32 lod);
 
     void modelUpdated(bool calculate_visible);
 
@@ -225,6 +223,11 @@ private:
 
     void createSmoothComboBox(LLComboBox* combo_box, float min, float max);
 
+    static std::string getBoundingBoxCubePath();
+    typedef std::map<std::string, std::string> lod_sources_map_t;
+    void fillLODSourceStatistics(lod_sources_map_t& lod_sources) const;
+
+    LLUUID mDestinationFolderId;
     LLButton* mUploadBtn;
     LLButton* mCalculateBtn;
     LLViewerTextEditor* mUploadLogText;