Downstream merge from lindenlab/viewer-serval

1 files changed, 16 insertions, 10 deletions

diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 5659cb2f79..363951041a 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -54,7 +54,7 @@ LLFloaterForgetUser::~LLFloaterForgetUser()
 
 BOOL LLFloaterForgetUser::postBuild()
 {
-    // Note, storage works per grid, watever is selected currently in login screen or logged in.
+    // Note, storage works per grid, whatever is selected currently in login screen or logged in.
     // Since login screen can change grid, store the value.
     mGrid = LLGridManager::getInstance()->getGrid();
 
@@ -87,19 +87,25 @@ BOOL LLFloaterForgetUser::postBuild()
         LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(mGrid);
         if (cred.notNull())
         {
-            LLScrollListItem::Params item_params;
-            item_params.value(cred->userID());
-            item_params.columns.add()
-                .value(LLPanelLogin::getUserName(cred))
-                .column("user")
-                .font(LLFontGL::getFontSansSerifSmall());
-            scroll_list->addRow(item_params, ADD_BOTTOM);
-            scroll_list->selectFirstItem();
+            const LLSD &ident = cred->getIdentifier();
+            if (ident.isMap() && ident.has("type"))
+            {
+                LLScrollListItem::Params item_params;
+                item_params.value(cred->userID());
+                item_params.columns.add()
+                    .value(LLPanelLogin::getUserName(cred))
+                    .column("user")
+                    .font(LLFontGL::getFontSansSerifSmall());
+                scroll_list->addRow(item_params, ADD_BOTTOM);
+                scroll_list->selectFirstItem();
+            }
         }
     }
 
     bool enable_button = scroll_list->getFirstSelectedIndex() != -1;
-    getChild<LLView>("delete_data")->setEnabled(enable_button);
+    LLCheckBoxCtrl *chk_box = getChild<LLCheckBoxCtrl>("delete_data");
+    chk_box->setEnabled(enable_button);
+    chk_box->set(FALSE);
     LLButton *button = getChild<LLButton>("forget");
     button->setEnabled(enable_button);
     button->setCommitCallback(boost::bind(&LLFloaterForgetUser::onForgetClicked, this));