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

Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui

master
Richard Linden 2012-07-25 22:50:28 -07:00
parent 88f259f7c1 891a09561d
commit e2e0003dea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfolderview.cpp
View File

@ -1122,7 +1122,7 @@ void LLFolderView::paste()
LLFolderViewFolder* folder = dynamic_cast<LLFolderViewFolder*>(item);
if (folder == NULL)
{
item = item->getParentFolder();
folder = item->getParentFolder();
}
folder_set.insert(folder);
}