diff options
| author | Richard Linden <none@none> | 2012-07-25 22:50:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-25 22:50:28 -0700 |
| commit | e2e0003dea5994ee36f18bba683fde4e7775db66 (patch) | |
| tree | 6b6fd5e0b99026e5a2cf38d3d79e84ca0c9bcf0b /indra | |
| parent | 88f259f7c1aefea197ae8b6c49a79de09feebf5b (diff) | |
| parent | 891a09561d4dff23836c8618d481a6cd2dd001de (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 147af04f30..d8ed09fbe6 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -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); } |