diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-29 21:00:25 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-29 21:00:25 +0300 |
| commit | 3f31901640b11740da43b23f0d9902407ee9313d (patch) | |
| tree | e9e8671a242831d736580423913603627e25775b /indra/newview/llpanellogin.cpp | |
| parent | 8ce21268a1723738aaded551812d71e5ec29c707 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge master (DRTVWR-515) into DRTVWR-516-maint
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index d7462f50e2..381b80fb66 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -548,6 +548,16 @@ void LLPanelLogin::show(const LLRect &rect, } //static +void LLPanelLogin::reshapePanel() +{ + if (sInstance) + { + LLRect rect = sInstance->getRect(); + sInstance->reshape(rect.getWidth(), rect.getHeight()); + } +} + +//static void LLPanelLogin::populateFields(LLPointer<LLCredential> credential, bool remember_user, bool remember_psswrd) { if (!sInstance) |