livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak the size of the AWP floater to take account of new image sizes. Do not center floater anymore because it obscures the avatar.

master
Callum Prentice 2025-06-06 17:21:19 -07:00
parent ddbcf74a8f
commit a366a49daf
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloateravatarwelcomepack.cpp
View File

@ -48,7 +48,6 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
bool LLFloaterAvatarWelcomePack::postBuild()
{
center();
mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
if (mAvatarPicker)
{

6
indra/newview/llstartup.cpp
View File

@ -2455,7 +2455,11 @@ bool idle_startup()
LLFloater* avatar_welcome_pack_floater = LLFloaterReg::findInstance("avatar_welcome_pack");
if (avatar_welcome_pack_floater != nullptr)
{
avatar_welcome_pack_floater->center();
// There is a (very - 1 in ~50 times) hard to repro bug where the login
// page is not hidden when the AWP floater is presented. This (agressive)
// approach to always close it seems like the best fix for now.
LLPanelLogin::closePanel();
avatar_welcome_pack_floater->setVisible(true);
}
}

12
indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
View File

@ -5,20 +5,20 @@
can_minimize="true"
can_close="true"
can_resize="false"
min_height="420"
min_width="500"
height="420"
min_height="438"
min_width="530"
height="438"
layout="topleft"
name="Avatar Welcome Pack"
single_instance="true"
save_rect="true"
save_visibility="true"
title="AVATAR WELCOME PACK"
width="500">
width="530">
<web_browser
top="25"
height="420"
width="500"
height="438"
width="530"
follows="all"
name="avatar_picker_contents"
trusted_content="true"/>