diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-17 18:21:49 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-17 18:21:49 +0200 |
| commit | e32a2e2f8ad072408cb9136d3d5fc5f02a232bef (patch) | |
| tree | db50bf84a728a61b1253f903b2bf4e758b45f76c | |
| parent | 75d910062546eedd609a4cb751bc707cbdd3eac8 (diff) | |
SL-9699 Fixed processing of placeholder
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index cfd486f7f3..4fd39d1211 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1230,8 +1230,12 @@ void LLPanelLogin::populateUserList(LLPointer<LLCredential> credential) { if (credential.notNull()) { - user_combo->add(LLPanelLogin::getUserName(credential), credential->userID(), ADD_BOTTOM, TRUE); - setFields(credential); + const LLSD &ident = credential->getIdentifier(); + if (ident.isMap() && ident.has("type")) + { + user_combo->add(LLPanelLogin::getUserName(credential), credential->userID(), ADD_BOTTOM, TRUE); + setFields(credential); + } } } } |