MAINT-6260 Fixed Rezing from trash causes dupes after restart

Tue, 20 Feb 2018 18:31:26 +0200

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Tue, 20 Feb 2018 18:31:26 +0200
changeset 55293
4d9446797e08
parent 55292
43f9351c7f6f
child 55294
ad11009ccf96

MAINT-6260 Fixed Rezing from trash causes dupes after restart

indra/newview/lltooldraganddrop.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/lltooldraganddrop.cpp	Tue Feb 20 17:52:36 2018 +0200
     1.2 +++ b/indra/newview/lltooldraganddrop.cpp	Tue Feb 20 18:31:26 2018 +0200
     1.3 @@ -1278,7 +1278,6 @@
     1.4  	if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id))
     1.5  	{
     1.6  		is_in_trash = true;
     1.7 -		remove_from_inventory = TRUE;
     1.8  	}
     1.9  
    1.10  	LLUUID source_id = from_task_inventory ? mSourceID : LLUUID::null;
    1.11 @@ -1806,7 +1805,6 @@
    1.12  	if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id))
    1.13  	{
    1.14  		accept = ACCEPT_YES_SINGLE;
    1.15 -		remove_inventory = TRUE;
    1.16  	}
    1.17  
    1.18  	if(drop)

mercurial