From b562eeb8331cce89cd240b1d28c6287fb6123994 Mon Sep 17 00:00:00 2001 From: ziree Date: Mon, 7 Jan 2013 23:09:36 +0100 Subject: [PATCH] Fix random crash on restore when not logged in. Per account settings should only be touched when an account is actually logged in. FIRE-1723 --- indra/newview/llfloaterpreference.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d136ef8c7e..9eb87c0ab1 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -3220,12 +3220,12 @@ void LLFloaterPreference::onClickRestoreSettings() gDirUtilp->getExpandedFilename(LL_PATH_NONE,backup_per_account_folder,mPerAccountFiles[index]), gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,mPerAccountFiles[index])); } - } - // toolbars get overwritten when LLToolbarView is destroyed, so make sure - // the toolbars are updated here already - gToolBarView->clearToolbars(); - gToolBarView->loadToolbars(FALSE); + // toolbars get overwritten when LLToolbarView is destroyed, so make sure + // the toolbars are updated here already + gToolBarView->clearToolbars(); + gToolBarView->loadToolbars(FALSE); + } // restore global folders and their contents for(S32 index=0;index