summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-03 17:05:28 -0700
committerRichard Linden <none@none>2012-07-03 17:05:28 -0700
commita8defa513c3b2b83f476a1de115fd0332566b483 (patch)
treec08141e3dd3379808aecdafa0f72635b7ed9f113 /indra/newview/llinventorybridge.cpp
parent7fb39240d0b0b849e5459c075ce973210d3c5c44 (diff)
CHUI-101 WIP Make LLFolderview general purpose
removed viewer dependencies from folderview code
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 002278601a..d17c25d9f3 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1400,7 +1400,7 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
else if ("cut" == action)
{
cutToClipboard();
- LLFolderView::removeCutItems();
+ gInventory.removeObject(mUUID);
return;
}
else if ("copy" == action)
@@ -1680,14 +1680,12 @@ BOOL LLItemBridge::renameItem(const std::string& new_name)
return FALSE;
}
-
BOOL LLItemBridge::removeItem()
{
if(!isItemRemovable())
{
return FALSE;
}
-
// move it to the trash
LLPreview::hide(mUUID, TRUE);
@@ -2870,7 +2868,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
else if ("cut" == action)
{
cutToClipboard();
- LLFolderView::removeCutItems();
+ gInventory.removeObject(mUUID);
return;
}
else if ("copy" == action)