diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 23 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | 2 |
2 files changed, 5 insertions, 20 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 | } |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml index 51e966c..8295d3a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | |||
@@ -166,10 +166,8 @@ | |||
166 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" /> | 166 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" /> |
167 | </menu_item_call> | 167 | </menu_item_call> |
168 | <menu_item_separator name="Copy Separator" /> | 168 | <menu_item_separator name="Copy Separator" /> |
169 | <!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961 | ||
170 | <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true" | 169 | <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true" |
171 | name="Cut" width="128"> | 170 | name="Cut" width="128"> |
172 | --> | ||
173 | <on_click filter="" function="Inventory.DoToSelected" userdata="cut" /> | 171 | <on_click filter="" function="Inventory.DoToSelected" userdata="cut" /> |
174 | </menu_item_call> | 172 | </menu_item_call> |
175 | <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true" | 173 | <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true" |