File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,6 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
48
48
49
49
bool LLFloaterAvatarWelcomePack::postBuild ()
50
50
{
51
- center ();
52
51
mAvatarPicker = findChild<LLMediaCtrl>(" avatar_picker_contents" );
53
52
if (mAvatarPicker )
54
53
{
Original file line number Diff line number Diff line change @@ -2455,7 +2455,11 @@ bool idle_startup()
2455
2455
LLFloater* avatar_welcome_pack_floater = LLFloaterReg::findInstance (" avatar_welcome_pack" );
2456
2456
if (avatar_welcome_pack_floater != nullptr )
2457
2457
{
2458
- avatar_welcome_pack_floater->center ();
2458
+ // There is a (very - 1 in ~50 times) hard to repro bug where the login
2459
+ // page is not hidden when the AWP floater is presented. This (agressive)
2460
+ // approach to always close it seems like the best fix for now.
2461
+ LLPanelLogin::closePanel ();
2462
+
2459
2463
avatar_welcome_pack_floater->setVisible (true );
2460
2464
}
2461
2465
}
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 =" 420 "
9
- min_width =" 500 "
10
- height =" 420 "
8
+ min_height =" 438 "
9
+ min_width =" 530 "
10
+ height =" 438 "
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 =" 500 " >
17
+ width =" 530 " >
18
18
<web_browser
19
19
top =" 25"
20
- height =" 420 "
21
- width =" 500 "
20
+ height =" 438 "
21
+ width =" 530 "
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