Put in some changes along sg1.4 dev history.

This commit is contained in:
Siana Gearz
2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions

View File

@@ -4260,7 +4260,7 @@ BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks)
return FALSE;
}
void LLFolderView::deleteAllChildren()
void LLFolderView::deleteAllChildren(BOOL delayed_delete)
{
if(mRenamer == gFocusMgr.getTopCtrl())
{
@@ -4271,7 +4271,7 @@ void LLFolderView::deleteAllChildren()
mRenamer = NULL;
mRenameItem = NULL;
clearSelection();
LLView::deleteAllChildren();
LLView::deleteAllChildren(delayed_delete);
}
void LLFolderView::scrollToShowSelection()