Merge branch develop into 2025.06

# Conflicts:
#	indra/newview/llvoavatar.cpp

1 files changed, 45 insertions, 0 deletions

diff --git a/indra/newview/llfloateravatarwelcomepack.h b/indra/newview/llfloateravatarwelcomepack.h
new file mode 100644
index 0000000000..a332d46708
--- /dev/null
+++ b/indra/newview/llfloateravatarwelcomepack.h
@@ -0,0 +1,45 @@
+/**
+ * @file llfloateravatarwelcomepack.h
+ * @author Callum Prentice (callum@lindenlab.com)
+ * @brief Floater container for the Avatar Welcome Pack we app
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#pragma once
+
+#include "llfloater.h"
+
+class LLMediaCtrl;
+
+class LLFloaterAvatarWelcomePack:
+    public LLFloater
+{
+    friend class LLFloaterReg;
+
+    private:
+        LLFloaterAvatarWelcomePack(const LLSD& key);
+        ~LLFloaterAvatarWelcomePack();
+        bool postBuild() override;
+
+        LLMediaCtrl* mAvatarPicker;
+};