File tree Expand file tree Collapse file tree 3 files changed +24
-9
lines changed Expand file tree Collapse file tree 3 files changed +24
-9
lines changed Original file line number Diff line number Diff line change @@ -48,6 +48,7 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
48
48
49
49
bool LLFloaterAvatarWelcomePack::postBuild ()
50
50
{
51
+ center ();
51
52
mAvatarPicker = findChild<LLMediaCtrl>(" avatar_picker_contents" );
52
53
if (mAvatarPicker )
53
54
{
Original file line number Diff line number Diff line change @@ -2103,9 +2103,6 @@ bool idle_startup()
2103
2103
2104
2104
do_startup_frame ();
2105
2105
2106
- // We're successfully logged in.
2107
- gSavedSettings .setBOOL (" FirstLoginThisInstall" , false );
2108
-
2109
2106
LLFloaterReg::showInitialVisibleInstances ();
2110
2107
2111
2108
LLFloaterGridStatus::getInstance ()->startGridStatusTimer ();
@@ -2451,6 +2448,23 @@ bool idle_startup()
2451
2448
2452
2449
LLPerfStats::StatsRecorder::setAutotuneInit ();
2453
2450
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
+
2454
2468
return true ;
2455
2469
}
2456
2470
Original file line number Diff line number Diff line change 5
5
can_minimize =" true"
6
6
can_close =" true"
7
7
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 "
11
11
layout =" topleft"
12
12
name =" Avatar Welcome Pack"
13
13
single_instance =" true"
14
14
save_rect =" true"
15
15
save_visibility =" true"
16
16
title =" AVATAR WELCOME PACK"
17
- width =" 800 " >
17
+ width =" 500 " >
18
18
<web_browser
19
19
top =" 25"
20
- height =" 660 "
21
- width =" 800 "
20
+ height =" 420 "
21
+ width =" 500 "
22
22
follows =" all"
23
23
name =" avatar_picker_contents"
24
24
trusted_content =" true" />
You can’t perform that action at this time.
0 commit comments