Open Avatar Welcome Pack floater on first login (or cleared settings) and move it to the center of the screen. Adjust the size of the floater (height) slightly.

3 files changed, 24 insertions, 9 deletions

diff --git a/indra/newview/llfloateravatarwelcomepack.cpp b/indra/newview/llfloateravatarwelcomepack.cpp
index 82e44d1398..06b6de0cbf 100644
--- a/indra/newview/llfloateravatarwelcomepack.cpp
+++ b/indra/newview/llfloateravatarwelcomepack.cpp
@@ -48,6 +48,7 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
 
 bool LLFloaterAvatarWelcomePack::postBuild()
 {
+    center();
     mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
     if (mAvatarPicker)
     {
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index cc4f49c0b4..f065d286c8 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2103,9 +2103,6 @@ bool idle_startup()
 
         do_startup_frame();
 
-        // We're successfully logged in.
-        gSavedSettings.setBOOL("FirstLoginThisInstall", false);
-
         LLFloaterReg::showInitialVisibleInstances();
 
         LLFloaterGridStatus::getInstance()->startGridStatusTimer();
@@ -2451,6 +2448,23 @@ bool idle_startup()
 
         LLPerfStats::StatsRecorder::setAutotuneInit();
 
+        // Display Avatar Welcome Pack the first time a user logs in
+        // (or clears their settings....)
+        if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
+        {
+            LLFloater* avatar_welcome_pack_floater = LLFloaterReg::findInstance("avatar_welcome_pack");
+            if (avatar_welcome_pack_floater != nullptr)
+            {
+                avatar_welcome_pack_floater->center();
+                avatar_welcome_pack_floater->setVisible(true);
+            }
+        }
+
+        //// We're successfully logged in.
+        // 2025-06 Moved lower down in the state machine so the Avatar Welcome Pack
+        // floater display can be triggered correctly.
+        gSavedSettings.setBOOL("FirstLoginThisInstall", false);
+
         return true;
     }
 
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml b/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
index 86aaf2a5c4..1b0f91c7ea 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
@@ -5,20 +5,20 @@
  can_minimize="true"
  can_close="true"
  can_resize="false"
- min_height="660"
- min_width="800"
- height="660"
+ min_height="420"
+ min_width="500"
+ height="420"
  layout="topleft"
  name="Avatar Welcome Pack"
  single_instance="true"
  save_rect="true"
  save_visibility="true"
  title="AVATAR WELCOME PACK"
- width="800">
+ width="500">
     <web_browser
       top="25"
-      height="660"
-      width="800"
+      height="420"
+      width="500"
       follows="all"
       name="avatar_picker_contents"
       trusted_content="true"/>