diff options
Diffstat (limited to 'linden/indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 23d864e..6e6b39c 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
| @@ -1439,7 +1439,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id, | |||
| 1439 | if(drop && accept) | 1439 | if(drop && accept) |
| 1440 | { | 1440 | { |
| 1441 | it = inventory_objects.begin(); | 1441 | it = inventory_objects.begin(); |
| 1442 | InventoryObjectList::iterator first_it = inventory_objects.begin(); | ||
| 1443 | LLMoveInv* move_inv = new LLMoveInv; | 1442 | LLMoveInv* move_inv = new LLMoveInv; |
| 1444 | move_inv->mObjectID = object_id; | 1443 | move_inv->mObjectID = object_id; |
| 1445 | move_inv->mCategoryID = category_id; | 1444 | move_inv->mCategoryID = category_id; |
| @@ -1922,24 +1921,11 @@ void LLFolderBridge::pasteFromClipboard() | |||
| 1922 | item = model->getItem(objects.get(i)); | 1921 | item = model->getItem(objects.get(i)); |
| 1923 | if (item) | 1922 | if (item) |
| 1924 | { | 1923 | { |
| 1925 | copy_inventory_item( | 1924 | LLInvFVBridge::changeItemParent( |
| 1926 | gAgent.getID(), | 1925 | model, |
| 1927 | item->getPermissions().getOwner(), | 1926 | (LLViewerInventoryItem*)item, |
| 1928 | item->getUUID(), | 1927 | mUUID, |
| 1929 | parent_id, | 1928 | FALSE); |
| 1930 | std::string(), | ||
| 1931 | LLPointer<LLInventoryCallback>(NULL)); | ||
| 1932 | LLInventoryCategory* cat = model->getCategory(item->getUUID()); | ||
| 1933 | if(cat) | ||
| 1934 | { | ||
| 1935 | model->purgeDescendentsOf(mUUID); | ||
| 1936 | } | ||
| 1937 | LLInventoryObject* obj = model->getObject(item->getUUID()); | ||
| 1938 | if(!obj) return; | ||
| 1939 | obj->removeFromServer(); | ||
| 1940 | LLPreview::hide(item->getUUID()); | ||
| 1941 | model->deleteObject(item->getUUID()); | ||
| 1942 | model->notifyObservers(); | ||
| 1943 | } | 1929 | } |
| 1944 | } | 1930 | } |
| 1945 | } | 1931 | } |