diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 18:22:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 18:22:17 +0300 |
| commit | 1fe92a9df951d37ec1373beef39dbb1bb8ae28c4 (patch) | |
| tree | 4ceb3992a66173b583d48b4e0d708f6e434f50f6 /indra | |
| parent | 2e238f0ba85f290582cf900a9e2f76eeb8528280 (diff) | |
SL-13340 Restored status display for login
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_progress.xml | 42 |
2 files changed, 12 insertions, 36 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index e9b1b5ea73..e9feae3457 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -517,8 +517,7 @@ void LLProgressView::initTextures(S32 location_id, bool is_in_production) initLogos(); childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE); - childSetVisible("panel_login", TRUE); - childSetVisible("panel_teleport", FALSE); + childSetVisible("panel_top_spacer", mLogosList.empty() ? TRUE : FALSE); } void LLProgressView::releaseTextures() @@ -526,8 +525,7 @@ void LLProgressView::releaseTextures() gStartTexture = NULL; mLogosList.clear(); - childSetVisible("panel_login", FALSE); - childSetVisible("panel_teleport", TRUE); + childSetVisible("panel_top_spacer", TRUE); childSetVisible("panel_icons", FALSE); } diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml index a0dfff3bd4..cb7e572aff 100644 --- a/indra/newview/skins/default/xui/en/panel_progress.xml +++ b/indra/newview/skins/default/xui/en/panel_progress.xml @@ -44,15 +44,15 @@ width="670" /> <layout_panel auto_resize="false" - height="250" + height="275" layout="topleft" - min_height="250" + min_height="275" name="panel4" width="670"> <icon color="LoginProgressBoxCenterColor" follows="left|right|bottom|top" - height="250" + height="275" image_name="Rounded_Square" layout="topleft" left="0" @@ -60,7 +60,7 @@ width="670" /> <layout_stack follows="left|right|top|bottom" - height="250" + height="275" layout="topleft" left="0" orientation="vertical" @@ -70,32 +70,18 @@ width="670"> <layout_panel auto_resize="false" - height="60" + height="30" layout="topleft" - min_height="60" - name="panel_login" + min_height="30" + name="panel_top_spacer" width="670"> - <text - follows="left|right|top" - layout="topleft" - font="SansSerifHuge" - font_shadow="none" - halign="left" - height="20" - left="47" - top="32" - right="-47" - name="login_text" - text_color="LoginProgressBoxTextColor"> - Logging in... - </text> </layout_panel> <layout_panel auto_resize="false" height="100" layout="topleft" min_height="100" - name="panel_teleport" + name="panel_login" width="670"> <text follows="left|right|top" @@ -105,7 +91,7 @@ halign="left" height="20" left="47" - top="50" + top="32" right="-47" name="title_text" text_color="LoginProgressBoxTextColor"/> @@ -122,14 +108,6 @@ name="progress_text" text_color="LoginProgressBoxTextColor" word_wrap="true"/> - </layout_panel> - <layout_panel - auto_resize="false" - height="19" - layout="topleft" - min_height="19" - name="panel_progress" - width="670"> <progress_bar color_bar="1 0.314 0 0.96" follows="left|right|top" @@ -137,7 +115,7 @@ image_fill="ProgressBarSolid" height="16" left="45" - top="2" + top_pad="5" name="login_progress_bar" right="-45" /> </layout_panel> |