diff options
Diffstat (limited to 'linden/indra/newview/llinventorybridge.cpp')
-rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index df32eab..c67c3c2 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
@@ -1921,24 +1921,11 @@ void LLFolderBridge::pasteFromClipboard() | |||
1921 | item = model->getItem(objects.get(i)); | 1921 | item = model->getItem(objects.get(i)); |
1922 | if (item) | 1922 | if (item) |
1923 | { | 1923 | { |
1924 | copy_inventory_item( | 1924 | LLInvFVBridge::changeItemParent( |
1925 | gAgent.getID(), | 1925 | model, |
1926 | item->getPermissions().getOwner(), | 1926 | (LLViewerInventoryItem*)item, |
1927 | item->getUUID(), | 1927 | mUUID, |
1928 | parent_id, | 1928 | FALSE); |
1929 | std::string(), | ||
1930 | LLPointer<LLInventoryCallback>(NULL)); | ||
1931 | LLInventoryCategory* cat = model->getCategory(item->getUUID()); | ||
1932 | if(cat) | ||
1933 | { | ||
1934 | model->purgeDescendentsOf(mUUID); | ||
1935 | } | ||
1936 | LLInventoryObject* obj = model->getObject(item->getUUID()); | ||
1937 | if(!obj) return; | ||
1938 | obj->removeFromServer(); | ||
1939 | LLPreview::hide(item->getUUID()); | ||
1940 | model->deleteObject(item->getUUID()); | ||
1941 | model->notifyObservers(); | ||
1942 | } | 1929 | } |
1943 | } | 1930 | } |
1944 | } | 1931 | } |