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

3 files changed, 11 insertions, 8 deletions

diff --git a/indra/newview/llfloateravatarwelcomepack.cpp b/indra/newview/llfloateravatarwelcomepack.cpp
index 06b6de0cbf..82e44d1398 100644
--- a/indra/newview/llfloateravatarwelcomepack.cpp
+++ b/indra/newview/llfloateravatarwelcomepack.cpp
@@ -48,7 +48,6 @@ LLFloaterAvatarWelcomePack::~LLFloaterAvatarWelcomePack()
 
 bool LLFloaterAvatarWelcomePack::postBuild()
 {
-    center();
     mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents");
     if (mAvatarPicker)
     {
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f065d286c8..6bf0a50d1c 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -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);
             }
         }
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml b/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
index 1b0f91c7ea..795d642755 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_welcome_pack.xml
@@ -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"/>