Skip to content

Commit a366a49

Browse files
committed
tweak the size of the AWP floater to take account of new image sizes. Do not center floater anymore because it obscures the avatar.
1 parent ddbcf74 commit a366a49

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

indra/newview/llfloateravatarwelcomepack.cpp

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

4949
bool LLFloaterAvatarWelcomePack::postBuild()
5050
{
51-
center();
5251
mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
5352
if (mAvatarPicker)
5453
{

indra/newview/llstartup.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2455,7 +2455,11 @@ bool idle_startup()
24552455
LLFloater* avatar_welcome_pack_floater = LLFloaterReg::findInstance("avatar_welcome_pack");
24562456
if (avatar_welcome_pack_floater != nullptr)
24572457
{
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+
24592463
avatar_welcome_pack_floater->setVisible(true);
24602464
}
24612465
}

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="420"
9-
min_width="500"
10-
height="420"
8+
min_height="438"
9+
min_width="530"
10+
height="438"
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="500">
17+
width="530">
1818
<web_browser
1919
top="25"
20-
height="420"
21-
width="500"
20+
height="438"
21+
width="530"
2222
follows="all"
2323
name="avatar_picker_contents"
2424
trusted_content="true"/>

0 commit comments

Comments
 (0)