diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-29 12:48:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-08-29 12:48:44 -0400 |
commit | 842ac1e1503e41662c924289905b43b336b52a53 (patch) | |
tree | d8067fc99f6c699e3d15510c8521a32102f5cb30 /indra/newview/llfloaterimagepreview.h | |
parent | 28678996ceaea019aafaa26911a440769320c498 (diff) | |
parent | 787b63f4c29f6ef56f355ec80084458a1bbcfb35 (diff) |
Merge pull request #4379 from secondlife/release/2025.06
Release/2025.06
Diffstat (limited to 'indra/newview/llfloaterimagepreview.h')
-rw-r--r-- | indra/newview/llfloaterimagepreview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h index ed395722de..5e5f4932c2 100644 --- a/indra/newview/llfloaterimagepreview.h +++ b/indra/newview/llfloaterimagepreview.h @@ -110,7 +110,7 @@ protected: class LLFloaterImagePreview : public LLFloaterNameDesc { public: - LLFloaterImagePreview(const std::string& filename); + LLFloaterImagePreview(const LLSD& args); virtual ~LLFloaterImagePreview(); bool postBuild() override; @@ -126,6 +126,8 @@ public: void clearAllPreviewTextures(); + void onBtnOK(); + protected: static void onPreviewTypeCommit(LLUICtrl*,void*); void draw() override; |