livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
ziree 2013-01-07 23:09:36 +01:00
parent dbde3431ed
commit b562eeb833
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterpreference.cpp
View File

@ -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<mGlobalFolders.size();index++)