Skip to content

Commit ddbcf74

Browse files
committed
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.
1 parent f65bb5e commit ddbcf74

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

indra/newview/llfloateravatarwelcomepack.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
4848

4949
bool LLFloaterAvatarWelcomePack::postBuild()
5050
{
51+
center();
5152
mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
5253
if (mAvatarPicker)
5354
{

indra/newview/llstartup.cpp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2103,9 +2103,6 @@ bool idle_startup()
21032103

21042104
do_startup_frame();
21052105

2106-
// We're successfully logged in.
2107-
gSavedSettings.setBOOL("FirstLoginThisInstall", false);
2108-
21092106
LLFloaterReg::showInitialVisibleInstances();
21102107

21112108
LLFloaterGridStatus::getInstance()->startGridStatusTimer();
@@ -2451,6 +2448,23 @@ bool idle_startup()
24512448

24522449
LLPerfStats::StatsRecorder::setAutotuneInit();
24532450

2451+
// Display Avatar Welcome Pack the first time a user logs in
2452+
// (or clears their settings....)
2453+
if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
2454+
{
2455+
LLFloater* avatar_welcome_pack_floater = LLFloaterReg::findInstance("avatar_welcome_pack");
2456+
if (avatar_welcome_pack_floater != nullptr)
2457+
{
2458+
avatar_welcome_pack_floater->center();
2459+
avatar_welcome_pack_floater->setVisible(true);
2460+
}
2461+
}
2462+
2463+
//// We're successfully logged in.
2464+
// 2025-06 Moved lower down in the state machine so the Avatar Welcome Pack
2465+
// floater display can be triggered correctly.
2466+
gSavedSettings.setBOOL("FirstLoginThisInstall", false);
2467+
24542468
return true;
24552469
}
24562470

indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
can_minimize="true"
66
can_close="true"
77
can_resize="false"
8-
min_height="660"
9-
min_width="800"
10-
height="660"
8+
min_height="420"
9+
min_width="500"
10+
height="420"
1111
layout="topleft"
1212
name="Avatar Welcome Pack"
1313
single_instance="true"
1414
save_rect="true"
1515
save_visibility="true"
1616
title="AVATAR WELCOME PACK"
17-
width="800">
17+
width="500">
1818
<web_browser
1919
top="25"
20-
height="660"
21-
width="800"
20+
height="420"
21+
width="500"
2222
follows="all"
2323
name="avatar_picker_contents"
2424
trusted_content="true"/>

0 commit comments

Comments
 (0)