diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-05 20:03:21 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-05 20:03:21 -0800 |
| commit | 85d380b210ebb609f6fc273918e06007c9da1950 (patch) | |
| tree | cc0a175ad98963a0a383fe9f62120bf53bacd275 | |
| parent | a56290f408cbae4c947a0e2f6ec1ad0e6baff60a (diff) | |
EXP-1917 : Fix items coming back in folders when quit after cut.
| -rw-r--r-- | indra/newview/llfolderview.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index ec954ac881..99a3d65c6f 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1383,6 +1383,7 @@ void LLFolderView::cut() listener->cutToClipboard(); } } + LLFolderView::removeCutItems(); } mSearchString.clear(); } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3001a998aa..49eb8db5be 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -220,7 +220,7 @@ BOOL LLInvFVBridge::cutToClipboard() const const LLInventoryObject* obj = gInventory.getObject(mUUID); if (obj && isItemMovable() && isItemRemovable()) { - LLClipboard::instance().setCutMode(true, boost::bind(LLFolderView::removeCutItems)); + LLClipboard::instance().setCutMode(true); return LLClipboard::instance().addToClipboard(mUUID); } return FALSE; @@ -1307,6 +1307,7 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action) else if ("cut" == action) { cutToClipboard(); + LLFolderView::removeCutItems(); return; } else if ("copy" == action) @@ -2697,6 +2698,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action) else if ("cut" == action) { cutToClipboard(); + LLFolderView::removeCutItems(); return; } else if ("copy" == action) |